diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2015-11-12 19:45:24 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2015-11-12 19:45:24 +0000 |
| commit | 1f82df91468a1e0634fae5119677c4b5f91d473d (patch) | |
| tree | 1e63ab4b54f926c70606901c9c5e6b408cbc1861 | |
| parent | 077fd8f1fa873337b99845805273e11cf968b498 (diff) | |
sasl: Re-introduced XOAUTH2 in the default enabled authentication mechanism
Following the fix in commit d6d58dd558 it is necessary to re-introduce
XOAUTH2 in the default enabled authentication mechanism, which was
removed in commit 7b2012f262, otherwise users will have to specify
AUTH=XOAUTH2 in the URL.
Note: OAuth 2.0 will only be used when the bearer is specified.
| -rw-r--r-- | lib/curl_sasl.c | 3 | ||||
| -rw-r--r-- | lib/curl_sasl.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c index dd2b6bef3..ad6b6090f 100644 --- a/lib/curl_sasl.c +++ b/lib/curl_sasl.c @@ -1455,8 +1455,7 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn, } else #endif - if((enabledmechs & SASL_MECH_XOAUTH2) && ((conn->oauth_bearer) || - (!conn->passwd))) { + if((enabledmechs & SASL_MECH_XOAUTH2) && conn->oauth_bearer) { mech = SASL_MECH_STRING_XOAUTH2; state1 = SASL_OAUTH2; sasl->authused = SASL_MECH_XOAUTH2; diff --git a/lib/curl_sasl.h b/lib/curl_sasl.h index b54d8f46b..ddf73f8f0 100644 --- a/lib/curl_sasl.h +++ b/lib/curl_sasl.h @@ -52,8 +52,7 @@ 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 | SASL_MECH_XOAUTH2)) +#define SASL_AUTH_DEFAULT (SASL_AUTH_ANY & ~SASL_MECH_EXTERNAL) /* Authentication mechanism strings */ #define SASL_MECH_STRING_LOGIN "LOGIN" |