From 7e513c1048fc506885ded033a37151309cc71af7 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Wed, 14 Aug 2019 09:47:17 +0200 Subject: vauth: return CURLE_AUTH_ERROR on gss_init_sec_context() failure This is a follow-up to https://github.com/curl/curl/pull/3864 . Closes #4224 --- lib/http_negotiate.c | 2 +- lib/vauth/spnego_gssapi.c | 2 +- lib/vauth/spnego_sspi.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c index fe15dcefb..8e1f3bf68 100644 --- a/lib/http_negotiate.c +++ b/lib/http_negotiate.c @@ -148,7 +148,7 @@ CURLcode Curl_output_negotiate(struct connectdata *conn, bool proxy) } if(!neg_ctx->context) { result = Curl_input_negotiate(conn, proxy, "Negotiate"); - if(result == CURLE_LOGIN_DENIED) { + if(result == CURLE_AUTH_ERROR) { /* negotiate auth failed, let's continue unauthenticated to stay * compatible with the behavior before curl-7_64_0-158-g6c6035532 */ authp->done = TRUE; diff --git a/lib/vauth/spnego_gssapi.c b/lib/vauth/spnego_gssapi.c index f05afca96..ed7ce029e 100644 --- a/lib/vauth/spnego_gssapi.c +++ b/lib/vauth/spnego_gssapi.c @@ -170,7 +170,7 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data, Curl_gss_log_error(data, "gss_init_sec_context() failed: ", major_status, minor_status); - return CURLE_LOGIN_DENIED; + return CURLE_AUTH_ERROR; } if(!output_token.value || !output_token.length) { diff --git a/lib/vauth/spnego_sspi.c b/lib/vauth/spnego_sspi.c index 13d7a4cfe..13e20db39 100644 --- a/lib/vauth/spnego_sspi.c +++ b/lib/vauth/spnego_sspi.c @@ -165,7 +165,7 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data, nego->p_identity, NULL, NULL, nego->credentials, &expiry); if(nego->status != SEC_E_OK) - return CURLE_LOGIN_DENIED; + return CURLE_AUTH_ERROR; /* Allocate our new context handle */ nego->context = calloc(1, sizeof(CtxtHandle)); -- cgit v1.2.3