From dc6eec69ba548c24d3a5a3ac23d9bd1e33644c65 Mon Sep 17 00:00:00 2001 From: Thomas Roessler Date: Thu, 30 Aug 2001 08:11:06 +0000 Subject: [PATCH] patch-20010829.vvv.pop_auth --- pop_auth.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pop_auth.c b/pop_auth.c index d7c59b91f..8ca1cdf4b 100644 --- a/pop_auth.c +++ b/pop_auth.c @@ -51,9 +51,12 @@ static pop_auth_res_t pop_auth_sasl (POP_DATA *pop_data, const char *method) return POP_A_FAILURE; } + if (!method) + method = pop_data->auth_list; + FOREVER { - rc = sasl_client_start (saslconn, pop_data->auth_list, NULL, + rc = sasl_client_start (saslconn, method, NULL, &interaction, &pc, &olen, &mech); if (rc != SASL_INTERACT) break; @@ -373,12 +376,7 @@ int pop_authenticate (POP_DATA* pop_data) attempts++; if (ret == POP_A_SUCCESS || ret == POP_A_SOCKET || (ret == POP_A_FAILURE && !option (OPTPOPAUTHTRYALL))) - { - /* awn@bcs.zp.ua: `comma' variable is unneeded here. This was - * cut-n-paste, IMHO. */ - /* comma = NULL; */ break; - } authenticator++; } -- 2.40.0