drop mod_ssl.starttls setting.

[apps/madmutt.git] / imap / imap.c

diff --git a/imap/imap.c b/imap/imap.c
index 1bd9c95..83bb6da 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -383,17 +383,15 @@ int imap_open_connection (IMAP_DATA * idata)
 
       if (mod_ssl.force_tls)
         rc = M_YES;
-      else if (mod_ssl.starttls) {
+      else {
         if ((rc = imap_exec (idata, "STARTTLS", IMAP_CMD_FAIL_OK)) == -1)
           goto bail;
         if (rc != -2) {
-          if (mutt_ssl_starttls (idata->conn))
-          {
+          if (mutt_ssl_starttls (idata->conn)) {
             mutt_error (_("Could not negotiate TLS connection"));
             mutt_sleep (1);
             goto err_close_conn;
-          }
-          else {
+          } else {
             /* RFC 2595 demands we recheck CAPABILITY after TLS completes. */
             if (imap_exec (idata, "CAPABILITY", 0))
               goto bail;