Don't engage STARTTLS when already in SSL mode.

diff --git a/imap/imap.c b/imap/imap.c
index 80460a2c042ddc15b2c5903b8bf1a8dcff8dc993..eb7cc01cef422303d679f490d8e645aeba56588d 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -377,7 +377,7 @@ int imap_open_connection (IMAP_DATA* idata)
       goto bail;
 #if defined(USE_SSL) && !defined(USE_NSS)
     /* Attempt STARTTLS if available and desired. */
-    if (mutt_bit_isset (idata->capabilities, STARTTLS))
+    if (mutt_bit_isset (idata->capabilities, STARTTLS) && !idata->conn->ssf)
     {
       if ((rc = query_quadoption (OPT_SSLSTARTTLS,
         _("Secure connection with TLS?"))) == -1)