moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Regression from commit 9e8ced9890 which meant if --oauth2-bearer was
specified but the SASL mechanism wasn't supported by the server then
the mechanism would be chosen.
This commit is contained in:
Steve Holme 2015-09-05 17:29:49 +01:00
parent a7c4bcd971
commit d6d58dd558
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/curl_sasl.c
View File

@ -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;