Commit b3440f49 authored by Steve Holme's avatar Steve Holme
Browse files

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: 6da7dc02.
parent 2dd56991

lib/imap.c

+6 −5
Original line number Diff line number Diff line
@@ -673,7 +673,8 @@ 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,

      result = Curl_sasl_create_ntlm_type1_message(conn->user, conn->passwd,

                                                   &conn->ntlm,

                                                   &initresp, &len);

  }

  else
@@ -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) {

    if(initresp) {

    /* Perform SASL based authentication */

    if(initresp) {

      result = imap_sendf(conn, "AUTHENTICATE %s %s", mech, initresp);



      if(!result)