diff options
| author | Peter Wang <novalazy@gmail.com> | 2020-05-08 10:43:45 +1000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-05-08 08:37:56 +0200 |
| commit | 1c341e2270b8f255ff108d80501b676d27d813c7 (patch) | |
| tree | f6b7b3aeee902df73c759def4a6ed813e018f850 | |
| parent | ace6ae4d0eb35eda85dbd076e76b1f34a52ebb06 (diff) | |
| download | curl-1c341e2270b8f255ff108d80501b676d27d813c7.tar.gz | |
*_sspi: fix bad uses of CURLE_NOT_BUILT_IN
Return CURLE_AUTH_ERROR instead of CURLE_NOT_BUILT_IN for other
instances of QuerySecurityPackageInfo failing, as in
commit 2a81439553286f12cd04a4bdcdf66d8e026d8201.
Closes #5355
| -rw-r--r-- | lib/vauth/digest_sspi.c | 9 | ||||
| -rw-r--r-- | lib/vauth/krb5_sspi.c | 3 | ||||
| -rw-r--r-- | lib/vauth/spnego_sspi.c | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c index a1090568b..5526b6833 100644 --- a/lib/vauth/digest_sspi.c +++ b/lib/vauth/digest_sspi.c @@ -134,7 +134,8 @@ CURLcode Curl_auth_create_digest_md5_message(struct Curl_easy *data, if(status != SEC_E_OK) { free(input_token); - return CURLE_NOT_BUILT_IN; + failf(data, "SSPI: couldn't get auth info\n"); + return CURLE_AUTH_ERROR; } token_max = SecurityPackage->cbMaxToken; @@ -431,8 +432,10 @@ CURLcode Curl_auth_create_digest_http_message(struct Curl_easy *data, /* Query the security package for DigestSSP */ status = s_pSecFn->QuerySecurityPackageInfo((TCHAR *) TEXT(SP_NAME_DIGEST), &SecurityPackage); - if(status != SEC_E_OK) - return CURLE_NOT_BUILT_IN; + if(status != SEC_E_OK) { + failf(data, "SSPI: couldn't get auth info\n"); + return CURLE_AUTH_ERROR; + } token_max = SecurityPackage->cbMaxToken; diff --git a/lib/vauth/krb5_sspi.c b/lib/vauth/krb5_sspi.c index 98041d915..8ec4d04b8 100644 --- a/lib/vauth/krb5_sspi.c +++ b/lib/vauth/krb5_sspi.c @@ -125,7 +125,8 @@ CURLcode Curl_auth_create_gssapi_user_message(struct Curl_easy *data, TEXT(SP_NAME_KERBEROS), &SecurityPackage); if(status != SEC_E_OK) { - return CURLE_NOT_BUILT_IN; + failf(data, "SSPI: couldn't get auth info\n"); + return CURLE_AUTH_ERROR; } krb5->token_max = SecurityPackage->cbMaxToken; diff --git a/lib/vauth/spnego_sspi.c b/lib/vauth/spnego_sspi.c index b9c2cf7d6..041cfb5f9 100644 --- a/lib/vauth/spnego_sspi.c +++ b/lib/vauth/spnego_sspi.c @@ -129,8 +129,10 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data, nego->status = s_pSecFn->QuerySecurityPackageInfo((TCHAR *) TEXT(SP_NAME_NEGOTIATE), &SecurityPackage); - if(nego->status != SEC_E_OK) - return CURLE_NOT_BUILT_IN; + if(nego->status != SEC_E_OK) { + failf(data, "SSPI: couldn't get auth info\n"); + return CURLE_AUTH_ERROR; + } nego->token_max = SecurityPackage->cbMaxToken; |