From 1eb6e35c80a4903c9b879e0ad363620078403307 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <ossi@users.sf.net>
Date: Tue, 20 Jan 2004 01:55:15 +0000
Subject: [PATCH] don't use STARTTLS for PREAUTH connections. uw-imap doesn't
 seem to like it, and it does not make too much sense anyway - i think - state
 converse opinions now.

---
 src/imap.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/imap.c b/src/imap.c
index a7521a1..694f949 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -742,6 +742,9 @@ imap_connect (config_t * cfg)
       if (imap_exec (imap, "CAPABILITY"))
 	goto bail;
 
+    if (!preauth)
+    {
+
 #if HAVE_LIBSSL
       if (!cfg->use_imaps)
       {
@@ -780,8 +783,6 @@ imap_connect (config_t * cfg)
       }
 #endif
 
-      if (!preauth)
-      {
 	info ("Logging in...\n");
 
 	if (!cfg->pass)
@@ -842,7 +843,7 @@ imap_connect (config_t * cfg)
 	    goto bail;
 	  }
 	}
-      }
+    } /* !preauth */
 
       /* get NAMESPACE info */
       if (cfg->use_namespace && imap->have_namespace)