X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pop%2Fpop_lib.c;h=f6587efc5789c723f1dde80db1c6be79bcdf6783;hb=6b8e3f7a8d030a75121a72ba89ae8063439aaa6c;hp=f4c17e993be5d44ed008790dd18c0df97c1a2abb;hpb=f3cbb9f51357972f6e74244494236a41dc4d84cd;p=apps%2Fmadmutt.git

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index f4c17e9..f6587ef 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -12,9 +12,6 @@
 
 #include "mutt.h"
 #include "pop.h"
-#if defined (USE_SSL) || defined (USE_GNUTLS)
-# include <lib-sys/mutt_ssl.h>
-#endif
 
 /* given an POP mailbox name, return host, port, username and password */
 int pop_parse_path (const char *path, ACCOUNT * act)
@@ -246,7 +243,6 @@ pop_query_status pop_open_connection (POP_DATA * pop_data)
     return PQ_ERR;
   }
 
-#if (defined(USE_SSL) || defined(USE_GNUTLS))
   /* Attempt STLS if available and desired. */
   if (!pop_data->conn->ssf && (pop_data->cmd_stls || option(OPTSSLFORCETLS))) {
     if (option (OPTSSLFORCETLS))
@@ -269,9 +265,7 @@ pop_query_status pop_open_connection (POP_DATA * pop_data)
         mutt_error ("%s", pop_data->err_msg);
         mutt_sleep (2);
       }
-#if defined (USE_SSL) || defined (USE_GNUTLS)
       else if (mutt_ssl_starttls (pop_data->conn))
-#endif
       {
         mutt_error (_("Could not negotiate TLS connection"));
         mutt_sleep (2);
@@ -295,7 +289,6 @@ pop_query_status pop_open_connection (POP_DATA * pop_data)
     mutt_sleep (1);
     return -2;
   }
-#endif
 
   ret = pop_authenticate (pop_data);
   if (ret == PQ_NOT_CONNECTED)