From: Thomas Roessler <roessler@does-not-exist.org>
Date: Thu, 1 Mar 2001 09:51:24 +0000 (+0000)
Subject: Don't engage STARTTLS when already in SSL mode.
X-Git-Tag: mutt-1-3-17-rel~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f84a96fdb3ac9006d3ee4452a1b02b87ffb461d;p=mutt

Don't engage STARTTLS when already in SSL mode.
---

diff --git a/imap/imap.c b/imap/imap.c
index 80460a2c..eb7cc01c 100644
--- 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)