---------------------
PatchSet 2925 
Date: 2001/08/31 09:07:06
Author: rbcollins
Branch: ntlm
Tag: (none) 
Log:
treat helpers as normal - no special cross config persistence

Members: 
	src/auth/ntlm/auth_ntlm.c:1.1.10.14.2.46->1.1.10.14.2.47 

Index: squid/src/auth/ntlm/auth_ntlm.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/auth/ntlm/auth_ntlm.c,v
retrieving revision 1.1.10.14.2.46
retrieving revision 1.1.10.14.2.47
diff -u -r1.1.10.14.2.46 -r1.1.10.14.2.47
--- squid/src/auth/ntlm/auth_ntlm.c	29 Aug 2001 13:59:44 -0000	1.1.10.14.2.46
+++ squid/src/auth/ntlm/auth_ntlm.c	31 Aug 2001 09:07:06 -0000	1.1.10.14.2.47
@@ -75,7 +75,6 @@
 static HLPSONEQ authenticateNTLMHelperServerOnEmpty;
 
 static statefulhelper *ntlmauthenticators = NULL;
-static wordlist *ntlmprevauthline = NULL;
 
 CBDATA_TYPE(authenticateStateData);
 
@@ -94,34 +93,17 @@
  *
  */
 
-static int
-wordliststrcmp(wordlist * a, wordlist * b)
-{
-    int i;
-    while (a && b) {
-	if ((i = strcmp(a->key, b->key)))
-	    return i;
-	a = a->next;
-	b = b->next;
-    }
-    if (a && !b)
-	return -1;
-    if (b && !a)
-	return 1;
-    return 0;
-}
-
 void
 authNTLMDone(void)
 {
     debug(29, 2) ("authNTLMDone: shutting down NTLM authentication.\n");
+    if (ntlmauthenticators)
+	helperStatefulShutdown(ntlmauthenticators);
     authntlm_initialised = 0;
     if (!shutting_down)
 	return;
-    if (ntlmauthenticators) {
-	helperStatefulShutdown(ntlmauthenticators);
+    if (ntlmauthenticators)
 	helperStatefulFree(ntlmauthenticators);
-    }
     ntlmauthenticators = NULL;
     if (ntlm_helper_state_pool) {
 	assert(memPoolInUseCount(ntlm_helper_state_pool) == 0);
@@ -262,13 +244,7 @@
 	ntlmauthenticators->datapool = ntlm_helper_state_pool;
 	ntlmauthenticators->IsAvailable = authenticateNTLMHelperServerAvailable;
 	ntlmauthenticators->OnEmptyQueue = authenticateNTLMHelperServerOnEmpty;
-	if (wordliststrcmp(ntlmprevauthline, ntlmConfig->authenticate)) {
-	    helperStatefulShutdown(ntlmauthenticators);
-	    helperStatefulOpenServers(ntlmauthenticators);
-	    if (ntlmprevauthline)
-		wordlistDestroy(&ntlmprevauthline);
-	    ntlmprevauthline = wordlistDup(ntlmConfig->authenticate);
-	}
+	helperStatefulOpenServers(ntlmauthenticators);
 	/* TODO: In here send the initial YR to preinitialise the challenge cache */
 	/* Think about this... currently we ask when the challenge is needed. Better? */
 	if (!ntlminit) {