From b3440f490f80b78733412d48e6c23a9cc71033ca Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Sun, 17 Mar 2013 00:20:42 +0000 Subject: [PATCH] imap: Fixed incorrect initial response generation for SASL AUTHENTICATE Fixed incorrect initial response generation for the NTLM and LOGIN SASL authentication mechanisms when the SASL-IR was detected. Introduced in commit: 6da7dc026c14. --- lib/imap.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/imap.c b/lib/imap.c index 25067c7b9..f5bd0fba4 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -673,8 +673,9 @@ static CURLcode imap_perform_authenticate(struct connectdata *conn) imapc->authused = SASL_MECH_NTLM; if(imapc->ir_supported) - result = Curl_sasl_create_login_message(conn->data, conn->user, - &initresp, &len); + result = Curl_sasl_create_ntlm_type1_message(conn->user, conn->passwd, + &conn->ntlm, + &initresp, &len); } else #endif @@ -685,8 +686,8 @@ static CURLcode imap_perform_authenticate(struct connectdata *conn) imapc->authused = SASL_MECH_LOGIN; if(imapc->ir_supported) - result = Curl_sasl_create_plain_message(conn->data, conn->user, - conn->passwd, &initresp, &len); + result = Curl_sasl_create_login_message(conn->data, conn->user, + &initresp, &len); } else if(imapc->authmechs & SASL_MECH_PLAIN) { mech = "PLAIN"; @@ -703,8 +704,8 @@ static CURLcode imap_perform_authenticate(struct connectdata *conn) return result; if(mech) { + /* Perform SASL based authentication */ if(initresp) { - /* Perform SASL based authentication */ result = imap_sendf(conn, "AUTHENTICATE %s %s", mech, initresp); if(!result)