Make X-IMAP test universal.

svn path=/trunk/; revision=1396

3 files changed, 0 insertions, 29 deletions

diff --git a/imap.c b/imap.c
index aba46b8a..ef4df99c 100644
--- a/imap.c
+++ b/imap.c
@@ -628,19 +628,6 @@ static int imap_delete(int sock, struct query *ctl, int number)
     return(PS_SUCCESS);
 }
 
-static flag imap_retain_check(int num, char *buf)
-/* is this a special message that should be retained? */
-{
-    /*
-     * The University of Washington IMAP server (the reference
-     * implementation of IMAP4 written by Mark Crispin) relies
-     * on being able to keep base-UID information in a special
-     * message at the head of the mailbox.  This message should
-     * neither be deleted nor forwarded.
-     */
-    return (num == 1 && !strncasecmp(buf, "X-IMAP:", 7));
-}
-
 const static struct method imap =
 {
     "IMAP",		/* Internet Message Access Protocol */
@@ -656,7 +643,6 @@ const static struct method imap =
     imap_fetch_body,	/* request given message body */
     imap_trail,		/* eat message trailer */
     imap_delete,	/* delete the message */
-    imap_retain_check,	/* leave this message alone? */
     "LOGOUT",		/* the IMAP exit command */
 };
 
diff --git a/pop2.c b/pop2.c
index b1ba8dfe..c3a4b650 100644
--- a/pop2.c
+++ b/pop2.c
@@ -129,7 +129,6 @@ const static struct method pop2 =
     NULL,				/* no way to fetch body alone */
     pop2_trail,				/* eat message trailer */
     NULL,				/* no POP2 delete method */
-    NULL,				/* no retained-header check */
     "QUIT",				/* the POP2 exit command */
 };
 
diff --git a/pop3.c b/pop3.c
index da364da4..b557a0e9 100644
--- a/pop3.c
+++ b/pop3.c
@@ -449,19 +449,6 @@ static int pop3_delete(int sock, struct query *ctl, int number)
     return(gen_transact(sock, "DELE %d", number));
 }
 
-static flag pop3_retain_check(int num, char *buf)
-/* is this a special message that should be retained? */
-{
-    /*
-     * The University of Washington IMAP server (the reference
-     * implementation of IMAP4 written by Mark Crispin) relies
-     * on being able to keep base-UID information in a special
-     * message at the head of the mailbox.  This message should
-     * neither be deleted nor forwarded.
-     */
-    return (num == 1 && !strncasecmp(buf, "X-IMAP:", 7));
-}
-
 const static struct method pop3 =
 {
     "POP3",		/* Post Office Protocol v3 */
@@ -477,7 +464,6 @@ const static struct method pop3 =
     NULL,		/* no way to fetch body alone */
     NULL,		/* no message trailer */
     pop3_delete,	/* how to delete a message */
-    pop3_retain_check,	/* try not to nuke an IMAP4rev header message */
     "QUIT",		/* the POP3 exit command */
 };