X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop_lib.c;h=693259d90325feb4554104a512123aeef4240fb2;hp=f6587efc5789c723f1dde80db1c6be79bcdf6783;hb=4f1b1414371cc373f50ca79a888928635a3a3763;hpb=3bb9d26e7eb111656d716e34d81225dfb16b6c4b

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index f6587ef..693259d 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -244,16 +244,12 @@ pop_query_status pop_open_connection (POP_DATA * pop_data)
   }
 
   /* 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) {
@@ -284,7 +280,7 @@ 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;