From 88d239144bf6f50ca1eda6db7742281f0ad0f97f Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Sun, 13 Jan 2008 22:27:35 +0100 Subject: [PATCH 1/1] using stls should not enable new CAPAs --- lib-mx/pop.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/lib-mx/pop.c b/lib-mx/pop.c index 876be67..189cb5d 100644 --- a/lib-mx/pop.c +++ b/lib-mx/pop.c @@ -586,7 +586,7 @@ static pop_query_status pop_capabilities(pop_data_t * pop_data, int mode) } /* Check capabilities */ - if (mode == 2) { + if (mode == 1) { const char *msg = NULL; if (pop_data->cmd_top == CMD_NOT_AVAILABLE) @@ -682,16 +682,6 @@ static pop_query_status pop_open_connection (pop_data_t * pop_data) 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; - } - } } } @@ -710,7 +700,7 @@ static pop_query_status pop_open_connection (pop_data_t * pop_data) 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) { -- 2.20.1