Commit 7b2012f2 authored by Patrick Monnerat's avatar Patrick Monnerat
Browse files

sasl: remove XOAUTH2 from default enabled authentication mechanism.

parent ed9a4b9f

lib/curl_sasl.c

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

    else

#endif

    if((((enabledmechs & SASL_MECH_XOAUTH2) &&

        sasl->prefmech != SASL_AUTH_DEFAULT)) || conn->xoauth2_bearer) {

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

      mech = SASL_MECH_STRING_XOAUTH2;

      state1 = SASL_XOAUTH2;

      sasl->authused = SASL_MECH_XOAUTH2;

lib/curl_sasl.h

+2 −1
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ struct kerberos5data; 
/* Authentication mechanism values */

#define SASL_AUTH_NONE          0

#define SASL_AUTH_ANY           ~0U

#define SASL_AUTH_DEFAULT       (SASL_AUTH_ANY & ~SASL_MECH_EXTERNAL)

#define SASL_AUTH_DEFAULT       (SASL_AUTH_ANY & \

                                 ~(SASL_MECH_EXTERNAL | SASL_MECH_XOAUTH2))



/* Authentication mechanism strings */

#define SASL_MECH_STRING_LOGIN      "LOGIN"