X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fimap.c;h=83bb6da48070788ffae24b7bdd1af54332e986d6;hb=HEAD;hp=ea2eb80fd6d10c8a076879126e81057fd3cf7852;hpb=8297f3a57ccff9c0663551658cdd5d3bf166249d;p=apps%2Fmadmutt.git

diff --git a/imap/imap.c b/imap/imap.c
index ea2eb80..83bb6da 100644
--- 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;
@@ -1542,7 +1540,7 @@ int imap_reconnect (CONTEXT * ctx)
   return 0;
 }
 
-int imap_is_magic (const char* path, struct stat* st __attribute__ ((unused))) {
+static int imap_is_magic (const char* path, struct stat* st __attribute__ ((unused))) {
   url_scheme_t s;
   if (!path || !*path)
     return -1;