create mod_ssl.

[apps/madmutt.git] / pop / pop_lib.c

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index f4c17e9..693259d 100644 (file)
--- 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,18 +243,13 @@ 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))
+  if (!pop_data->conn->ssf && (pop_data->cmd_stls || mod_ssl.force_tls)) {
+    if (mod_ssl.force_tls)
       pop_data->use_stls = 2;
     if (pop_data->use_stls == 0) {
-      ret = query_quadoption (OPT_SSLSTARTTLS,
-                              _("Secure connection with TLS?"));
-      if (ret == -1)
-        return PQ_ERR;
       pop_data->use_stls = 1;
-      if (ret == M_YES)
+      if (mod_ssl.starttls)
         pop_data->use_stls = 2;
     }
     if (pop_data->use_stls == 2) {
@@ -269,9 +261,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);
@@ -290,12 +280,11 @@ pop_query_status pop_open_connection (POP_DATA * pop_data)
     }
   }
 
-  if (option(OPTSSLFORCETLS) && !pop_data->conn->ssf) {
+  if (mod_ssl.force_tls && !pop_data->conn->ssf) {
     mutt_error _("Encrypted connection unavailable");
     mutt_sleep (1);
     return -2;
   }
-#endif
 
   ret = pop_authenticate (pop_data);
   if (ret == PQ_NOT_CONNECTED)