From: Steve Holme <steve_holme@hotmail.com>
Date: Fri, 1 Apr 2016 20:48:35 +0000 (+0100)
Subject: http_negotiate: Corrected host and proxy host name being wrong way round
X-Git-Tag: curl-7_49_0~239
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0aa8da10bbdafa;p=thirdparty%2Fcurl.git

http_negotiate: Corrected host and proxy host name being wrong way round

I had accidentally used the proxy server name for the host and the host
server name for the proxy in commit ad5e9bfd5d and 6d6f9ca1d9. Whilst
Windows SSPI was quite happy with this, GSS-API wasn't.

Thanks-to:  Michael Osipov
---

diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c
index 99a4dbdadc..9e1a83cccd 100644
--- a/lib/http_negotiate.c
+++ b/lib/http_negotiate.c
@@ -54,14 +54,14 @@ CURLcode Curl_input_negotiate(struct connectdata *conn, bool proxy,
     userp = conn->proxyuser;
     passwdp = conn->proxypasswd;
     service = data->set.str[STRING_PROXY_SERVICE_NAME];
-    host = conn->host.name;
+    host = conn->proxy.name;
     neg_ctx = &data->state.proxyneg;
   }
   else {
     userp = conn->user;
     passwdp = conn->passwd;
     service = data->set.str[STRING_SERVICE_NAME];
-    host = conn->proxy.name;
+    host = conn->host.name;
     neg_ctx = &data->state.negotiate;
   }