From: Steve Hill <steve@opendium.com>
Date: Thu, 27 Dec 2012 02:35:28 +0000 (-0700)
Subject: Bug 3650: Negotiate auth missing challenge token
X-Git-Tag: SQUID_3_3_0_3~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4723abf8688ede621bbf3b0703944f2b3a125dce;p=thirdparty%2Fsquid.git

Bug 3650: Negotiate auth missing challenge token
---

diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc
index c40bb0818d..9710f58c33 100644
--- a/src/auth/negotiate/auth_negotiate.cc
+++ b/src/auth/negotiate/auth_negotiate.cc
@@ -65,9 +65,6 @@ statefulhelper *negotiateauthenticators = NULL;
 /// \ingroup AuthNegotiateInternal
 static int authnegotiate_initialised = 0;
 
-/// \ingroup AuthNegotiateInternal
-Auth::Negotiate::Config negotiateConfig;
-
 /// \ingroup AuthNegotiateInternal
 static hash_table *proxy_auth_cache = NULL;
 
@@ -292,7 +289,7 @@ authenticateNegotiateStats(StoreEntry * sentry)
 Auth::UserRequest::Pointer
 Auth::Negotiate::Config::decode(char const *proxy_auth)
 {
-    Auth::Negotiate::User *newUser = new Auth::Negotiate::User(&negotiateConfig);
+    Auth::Negotiate::User *newUser = new Auth::Negotiate::User(Auth::Config::Find("negotiate"));
     Auth::UserRequest *auth_user_request = new Auth::Negotiate::UserRequest();
     assert(auth_user_request->user() == NULL);