moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-01-08 12:28:06 -05:00
Code Issues Releases Wiki Activity

sasl: remove XOAUTH2 from default enabled authentication mechanism.

Browse Source
This commit is contained in:
Patrick Monnerat 2015-01-27 18:08:18 +01:00
parent ed9a4b9fc4
commit 7b2012f262
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/curl_sasl.c
View File

@ -1440,8 +1440,7 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn,
} }
else else
#endif #endif
if((((enabledmechs & SASL_MECH_XOAUTH2) && if((enabledmechs & SASL_MECH_XOAUTH2) || conn->xoauth2_bearer) {
sasl->prefmech != SASL_AUTH_DEFAULT)) || conn->xoauth2_bearer) {
mech = SASL_MECH_STRING_XOAUTH2; mech = SASL_MECH_STRING_XOAUTH2;
state1 = SASL_XOAUTH2; state1 = SASL_XOAUTH2;
sasl->authused = SASL_MECH_XOAUTH2; sasl->authused = SASL_MECH_XOAUTH2;

3
lib/curl_sasl.h
View File

@ -52,7 +52,8 @@ struct kerberos5data;
/* Authentication mechanism values */ /* Authentication mechanism values */
#define SASL_AUTH_NONE 0 #define SASL_AUTH_NONE 0
#define SASL_AUTH_ANY ~0U #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 */ /* Authentication mechanism strings */
#define SASL_MECH_STRING_LOGIN "LOGIN" #define SASL_MECH_STRING_LOGIN "LOGIN"