From ea6531cf32a7c46d2c919f02c6b650e31a458052 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 24 Feb 2009 08:30:09 +0000 Subject: - Brian J. Murrell found out that Negotiate proxy authentication didn't work. It happened because the code used the struct for server-based auth all the time for both proxy and server auth which of course was wrong. --- lib/http.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/http.c b/lib/http.c index dc5066f8a..dfd19dd86 100644 --- a/lib/http.c +++ b/lib/http.c @@ -516,6 +516,10 @@ output_auth_headers(struct connectdata *conn, struct SessionHandle *data = conn->data; const char *auth=NULL; CURLcode result = CURLE_OK; +#ifdef HAVE_GSSAPI + struct negotiatedata *negdata = proxy? + &data->state.proxyneg:&data->state.negotiate; +#endif #ifndef CURL_DISABLE_CRYPTO_AUTH (void)request; @@ -524,14 +528,13 @@ output_auth_headers(struct connectdata *conn, #ifdef HAVE_GSSAPI if((authstatus->picked == CURLAUTH_GSSNEGOTIATE) && - data->state.negotiate.context && - !GSS_ERROR(data->state.negotiate.status)) { + negdata->context && !GSS_ERROR(negdata->status)) { auth="GSS-Negotiate"; result = Curl_output_negotiate(conn, proxy); if(result) return result; authstatus->done = TRUE; - data->state.negotiate.state = GSS_AUTHSENT; + negdata->state = GSS_AUTHSENT; } else #endif -- cgit v1.2.3