------------------------------------------------------------
revno: 11741
revision-id: squid3@treenet.co.nz-20121227030145-klmchd0lla761bee
parent: squid3@treenet.co.nz-20121227025857-5jmdf97iilvs7k8t
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.2
timestamp: Wed 2012-12-26 20:01:45 -0700
message:
  Bug 3650: Negotiate auth missing challenge token
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20121227030145-klmchd0lla761bee
# target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
#   /SQUID_3_2
# testament_sha1: e2980faa068930609998b08976e84843c32a50b9
# timestamp: 2012-12-27 03:01:59 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
#   /SQUID_3_2
# base_revision_id: squid3@treenet.co.nz-20121227025857-\
#   5jmdf97iilvs7k8t
# 
# Begin patch
=== modified file 'src/auth/negotiate/auth_negotiate.cc'
--- src/auth/negotiate/auth_negotiate.cc	2012-02-05 06:09:46 +0000
+++ src/auth/negotiate/auth_negotiate.cc	2012-12-27 03:01:45 +0000
@@ -67,9 +67,6 @@
 static int authnegotiate_initialised = 0;
 
 /// \ingroup AuthNegotiateInternal
-Auth::Negotiate::Config negotiateConfig;
-
-/// \ingroup AuthNegotiateInternal
 static hash_table *proxy_auth_cache = NULL;
 
 /*
@@ -293,7 +290,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);