Merge branch 'legacy_63'

[~andy/fetchmail] / imap.c

diff --git a/imap.c b/imap.c
index a181b1dbaf4da4916b11ba75356a2528497fc450..a598519b59e1685c1d6eee7fb937cc609620837a 100644 (file)
--- a/imap.c
+++ b/imap.c
@@ -1130,7 +1130,8 @@ static int imap_fetch_headers(int sock, struct query *ctl,int number,int *lenp)
 
        /* try to recover for some responses */
        if (!strncmp(buf, "* NO", 4) ||
-               !strncmp(buf, "* BAD", 5))
+               !strncmp(buf, "* BAD", 5) ||
+               strstr(buf, "FETCH ()"))
        {
            return(PS_TRANSIENT);
        }
@@ -1145,7 +1146,7 @@ static int imap_fetch_headers(int sock, struct query *ctl,int number,int *lenp)
        /* an unexpected tagged response */
        if (outlevel > O_SILENT)
            report(stderr, GT_("Incorrect FETCH response: %s.\n"), buf);
-       return(PS_ERROR);
+       return(PS_TRANSIENT);
     }
     return(ok);
 }
@@ -1256,13 +1257,6 @@ static int imap_delete(int sock, struct query *ctl, int number)
 /* set delete flag for given message */
 {
     int        ok;
-    /* Select which flags to set on message deletion: */
-    const char delflags_seen[] = "\\Seen \\Deleted";
-    static const char *delflags;
-    /* Which environment variable to look for: */
-
-    /* DEFAULT since many fetchmail versions <= 6.3.X */
-    delflags = delflags_seen;
 
     (void)ctl;
     /* expunges change the fetch numbers */