using stls should not enable new CAPAs

[apps/madmutt.git] / lib-mx / pop.c

diff --git a/lib-mx/pop.c b/lib-mx/pop.c
index 38d77dc..189cb5d 100644 (file)
--- a/lib-mx/pop.c
+++ b/lib-mx/pop.c
@@ -70,7 +70,6 @@ typedef struct {
     cmd_status cmd_uidl   : 2;      /* optional command UIDL */
     cmd_status cmd_top    : 2;      /* optional command TOP  */
     cmd_status cmd_user   : 2;      /* optional command USER */
     cmd_status cmd_uidl   : 2;      /* optional command UIDL */
     cmd_status cmd_top    : 2;      /* optional command TOP  */
     cmd_status cmd_user   : 2;      /* optional command USER */

-    unsigned resp_codes   : 1;      /* server supports extended response codes */

     unsigned clear_cache  : 1;
 
     ssize_t size;
     unsigned clear_cache  : 1;
 
     ssize_t size;


@@ -558,7 +557,6 @@ static pop_query_status pop_capabilities(pop_data_t * pop_data, int mode)
     pop_data->cmd_uidl   = CMD_NOT_AVAILABLE;
     pop_data->cmd_top    = CMD_NOT_AVAILABLE;
     pop_data->cmd_user   = CMD_NOT_AVAILABLE;
     pop_data->cmd_uidl   = CMD_NOT_AVAILABLE;
     pop_data->cmd_top    = CMD_NOT_AVAILABLE;
     pop_data->cmd_user   = CMD_NOT_AVAILABLE;

-    pop_data->resp_codes = 0;

     p_delete(&pop_data->auth_list);
   }
 
     p_delete(&pop_data->auth_list);
   }
 


@@ -588,7 +586,7 @@ static pop_query_status pop_capabilities(pop_data_t * pop_data, int mode)
   }
 
   /* Check capabilities */
   }
 
   /* Check capabilities */

-  if (mode == 2) {
+  if (mode == 1) {

     const char *msg = NULL;
 
     if (pop_data->cmd_top == CMD_NOT_AVAILABLE)
     const char *msg = NULL;
 
     if (pop_data->cmd_top == CMD_NOT_AVAILABLE)


@@ -684,16 +682,6 @@ static pop_query_status pop_open_connection (pop_data_t * pop_data)
         mutt_sleep (2);
         return PQ_ERR;
       }
         mutt_sleep (2);
         return PQ_ERR;
       }

-      else {
-        /* recheck capabilities after STLS completes */
-        ret = pop_capabilities (pop_data, 1);
-        if (ret == PQ_NOT_CONNECTED)
-          goto err_conn;
-        if (ret == PQ_ERR) {
-          mutt_sleep (2);
-          return PQ_ERR;
-        }
-      }

     }
   }
 
     }
   }
 


@@ -712,7 +700,7 @@ static pop_query_status pop_open_connection (pop_data_t * pop_data)
     return ret;
 
   /* recheck capabilities after authentication */
     return ret;
 
   /* recheck capabilities after authentication */

-  ret = pop_capabilities (pop_data, 2);
+  ret = pop_capabilities (pop_data, 1);

   if (ret == PQ_NOT_CONNECTED)
     goto err_conn;
   if (ret == PQ_ERR) {
   if (ret == PQ_NOT_CONNECTED)
     goto err_conn;
   if (ret == PQ_ERR) {