curl-library
[PATCH 5/5] Fix negotiate auth to proxies to track correct state
From: David Woodhouse <dwmw2_at_infradead.org>
Date: Fri, 11 Jul 2014 12:30:44 +0100
Received on 2014-07-11
Date: Fri, 11 Jul 2014 12:30:44 +0100
From: David Woodhouse <David.Woodhouse_at_intel.com>
--- lib/http.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/http.c b/lib/http.c index fe9ae3e..0b7c79b 100644 --- a/lib/http.c +++ b/lib/http.c @@ -737,6 +739,10 @@ CURLcode Curl_http_input_auth(struct connectdata *conn, bool proxy, */ struct SessionHandle *data = conn->data; +#ifdef USE_HTTP_NEGOTIATE + struct negotiatedata *negdata = proxy? + &data->state.proxyneg:&data->state.negotiate; +#endif unsigned long *availp; struct auth *authp; @@ -775,8 +781,7 @@ CURLcode Curl_http_input_auth(struct connectdata *conn, bool proxy, authp->avail |= CURLAUTH_GSSNEGOTIATE; if(authp->picked == CURLAUTH_GSSNEGOTIATE) { - if(data->state.negotiate.state == GSS_AUTHSENT || - data->state.negotiate.state == GSS_AUTHNONE) { + if(negdata->state == GSS_AUTHSENT || negdata->state == GSS_AUTHNONE) { neg = Curl_input_negotiate(conn, proxy, auth); if(neg == 0) { DEBUGASSERT(!data->req.newurl); @@ -785,7 +790,7 @@ CURLcode Curl_http_input_auth(struct connectdata *conn, bool proxy, return CURLE_OUT_OF_MEMORY; data->state.authproblem = FALSE; /* we received GSS auth info and we dealt with it fine */ - data->state.negotiate.state = GSS_AUTHRECV; + negdata->state = GSS_AUTHRECV; } else data->state.authproblem = TRUE; -- 1.9.3 -- David Woodhouse Open Source Technology Centre David.Woodhouse_at_intel.com Intel Corporation
-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette: http://curl.haxx.se/mail/etiquette.html
- application/x-pkcs7-signature attachment: smime.p7s