From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 21 Jan 2010 23:52:16 +0000 (+1300)
Subject: Several build and run issues found
X-Git-Tag: SQUID_3_2_0_1~167^2~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cdabe87d5fe2789fc2072d627a1095fd93ceb540;p=thirdparty%2Fsquid.git

Several build and run issues found
---

diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc
index 9bffc1b1ec..3a91b594b2 100644
--- a/src/auth/basic/auth_basic.cc
+++ b/src/auth/basic/auth_basic.cc
@@ -294,7 +294,6 @@ AuthBasicConfig::dump(StoreEntry * entry, const char *name, AuthConfig * scheme)
 
 AuthBasicConfig::AuthBasicConfig() :
         authenticateChildren(20,0,1,1),
-        authenticateConcurrency(1),
         authenticate(NULL),
         credentialsTTL( 2*60*60 ),
         casesensitive(0),
diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc
index d318b3ed04..68e38e0a7e 100644
--- a/src/auth/negotiate/auth_negotiate.cc
+++ b/src/auth/negotiate/auth_negotiate.cc
@@ -109,14 +109,10 @@ AuthNegotiateConfig::done()
     delete negotiateauthenticators;
     negotiateauthenticators = NULL;
 
-    debugs(29, 2, "negotiateScheme::done: Negotiate authentication Shutdown.");
-}
-
-void
-AuthNegotiateConfig::done()
-{
     if (authenticate)
         wordlistDestroy(&authenticate);
+
+    debugs(29, 2, "negotiateScheme::done: Negotiate authentication Shutdown.");
 }
 
 void
diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc
index 8e45709a11..df807ceaea 100644
--- a/src/auth/ntlm/auth_ntlm.cc
+++ b/src/auth/ntlm/auth_ntlm.cc
@@ -90,15 +90,10 @@ AuthNTLMConfig::done()
     delete ntlmauthenticators;
     ntlmauthenticators = NULL;
 
-    debugs(29, 2, "ntlmScheme::done: NTLM authentication Shutdown.");
-}
-
-/* free any allocated configuration details */
-void
-AuthNTLMConfig::done()
-{
     if (authenticate)
         wordlistDestroy(&authenticate);
+
+    debugs(29, 2, "ntlmScheme::done: NTLM authentication Shutdown.");
 }
 
 void