[patch] patch to fix STLS regression

fetchmail-6.3.6.patch1.tls-regression.patch (text/plain), 974 bytes, created by Matthias Andree on 2007-02-17 09:22:10 UTC

Index: pop3.c
===================================================================
--- pop3.c	(Revision 5021)
+++ pop3.c	(Revision 5022)
@@ -635,17 +635,6 @@
 	}
 	memset(shroud, 0x55, sizeof(shroud));
 	shroud[0] = '\0';
-#ifdef SSL_ENABLE
-	/* this is for servers which claim to support TLS, but actually
-	 * don't! */
-	if (connection_may_have_tls_errors && ok == PS_SOCKET)
-	{
-	    xfree(ctl->sslproto);
-	    ctl->sslproto = xstrdup("");
-	    /* repoll immediately without TLS */
-	    ok = PS_REPOLL;
-	}
-#endif
 	break;
 
     case P_APOP:
@@ -694,6 +683,18 @@
 	ok = PS_ERROR;
     }
 
+#ifdef SSL_ENABLE
+    /* this is for servers which claim to support TLS, but actually
+     * don't! */
+    if (connection_may_have_tls_errors && ok == PS_SOCKET)
+    {
+	xfree(ctl->sslproto);
+	ctl->sslproto = xstrdup("");
+	/* repoll immediately without TLS */
+	ok = PS_REPOLL;
+    }
+#endif
+
     if (ok != 0)
     {
 	/* maybe we detected a lock-busy condition? */