------------------------------------------------------------
revno: 12428
revision-id: squid3@treenet.co.nz-20121227023528-5t3r7jea1lh525v0
parent: squid3@treenet.co.nz-20121227023332-qp533ypw2chjel5c
fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3650
author: Steve Hill <steve@opendium.com>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Wed 2012-12-26 19:35:28 -0700
message:
  Bug 3650: Negotiate auth missing challenge token
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20121227023528-5t3r7jea1lh525v0
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 74870d753ba082b28b9b0e61023a526bb6919e54
# timestamp: 2012-12-27 02:38:17 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20121227023332-\
#   qp533ypw2chjel5c
# 
# Begin patch
=== modified file 'src/auth/negotiate/auth_negotiate.cc'
--- src/auth/negotiate/auth_negotiate.cc	2012-09-19 17:16:56 +0000
+++ src/auth/negotiate/auth_negotiate.cc	2012-12-27 02:35:28 +0000
@@ -66,9 +66,6 @@
 static int authnegotiate_initialised = 0;
 
 /// \ingroup AuthNegotiateInternal
-Auth::Negotiate::Config negotiateConfig;
-
-/// \ingroup AuthNegotiateInternal
 static hash_table *proxy_auth_cache = NULL;
 
 /*
@@ -292,7 +289,7 @@
 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);