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

sasl: Don't choose OAuth 2.0 if mechanism not advertised 

Regression from commit 9e8ced98 which meant if --oauth2-bearer was
specified but the SASL mechanism wasn't supported by the server then
the mechanism would be chosen.
parent a7c4bcd9

lib/curl_sasl.c

+2 −1
Original line number Diff line number Diff line
@@ -1455,7 +1455,8 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn, 
      }

    else

#endif

    if((enabledmechs & SASL_MECH_XOAUTH2) || conn->oauth_bearer) {

    if((enabledmechs & SASL_MECH_XOAUTH2) && ((conn->oauth_bearer) ||

                                              (!conn->passwd))) {

      mech = SASL_MECH_STRING_XOAUTH2;

      state1 = SASL_XOAUTH2;

      sasl->authused = SASL_MECH_XOAUTH2;