X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=imap.c;h=cb87eda5378f258f20955c3524f2f84c6d29cd0e;hb=ecade79a63e9abad933e3705a02533620ddc92b5;hp=dca3bab9f51448cba5c3e81804ca775c4773f648;hpb=1e909f8b8b6f9705134389164a211e1eb591c4b6;p=~andy%2Ffetchmail

diff --git a/imap.c b/imap.c
index dca3bab9..cb87eda5 100644
--- a/imap.c
+++ b/imap.c
@@ -447,9 +447,9 @@ static int imap_getauth(int sock, struct query *ctl, char *greeting)
 	     * whether TLS is mandatory or opportunistic unless SSLOpen() fails
 	     * (see below). */
 	    if (gen_transact(sock, "STARTTLS") == PS_SUCCESS
-		    && SSLOpen(sock, ctl->sslcert, ctl->sslkey, "tls1", ctl->sslcertck,
+		    && (set_timeout(mytimeout), SSLOpen(sock, ctl->sslcert, ctl->sslkey, "tls1", ctl->sslcertck,
 			ctl->sslcertfile, ctl->sslcertpath, ctl->sslfingerprint, commonname,
-			ctl->server.pollname, &ctl->remotename) != -1)
+			ctl->server.pollname, &ctl->remotename)) != -1)
 	    {
 		/*
 		 * RFC 2595 says this:
@@ -473,9 +473,11 @@ static int imap_getauth(int sock, struct query *ctl, char *greeting)
 	    } else if (must_tls(ctl)) {
 		/* Config required TLS but we couldn't guarantee it, so we must
 		 * stop. */
+		set_timeout(0);
 		report(stderr, GT_("%s: upgrade to TLS failed.\n"), commonname);
 		return PS_SOCKET;
 	    } else {
+		set_timeout(0);
 		if (outlevel >= O_VERBOSE) {
 		    report(stdout, GT_("%s: opportunistic upgrade to TLS failed, trying to continue\n"), commonname);
 		}
@@ -1164,7 +1166,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);
 	}
@@ -1179,7 +1182,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);
 }
@@ -1297,20 +1300,11 @@ static int imap_delete(int sock, struct query *ctl, int number)
     int	ok;
     /* Select which flags to set on message deletion: */
     const char delflags_seen[] = "\\Seen \\Deleted";
-    const char delflags_unseen[] = "\\Deleted";
     static const char *delflags;
     /* Which environment variable to look for: */
-    const char dis_env[] = "FETCHMAIL_IMAP_DELETED_REMAINS_UNSEEN";
 
-    if (!delflags) {
-	char *tmp;
-	if ((tmp = getenv(dis_env)) != NULL && *tmp) {
-	    delflags = delflags_unseen;
-	} else {
-	    /* DEFAULT since many fetchmail versions <= 6.3.X */
-	    delflags = delflags_seen;
-	}
-    }
+    /* DEFAULT since many fetchmail versions <= 6.3.X */
+    delflags = delflags_seen;
 
     (void)ctl;
     /* expunges change the fetch numbers */