---------------------
PatchSet 6109 
Date: 2004/01/03 14:55:54
Author: serassio
Branch: nt-2_5
Tag: (none) 
Log:
There is still somenthing of wrong in the NTLM challenge reuse logic, on Windows the native NTLMSSP helper can't accept reused challenge, so we need this workaround

Members: 
	src/auth/ntlm/auth_ntlm.c:1.18.2.1.4.7->1.18.2.1.4.8 

Index: squid/src/auth/ntlm/auth_ntlm.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/auth/ntlm/auth_ntlm.c,v
retrieving revision 1.18.2.1.4.7
retrieving revision 1.18.2.1.4.8
diff -u -r1.18.2.1.4.7 -r1.18.2.1.4.8
--- squid/src/auth/ntlm/auth_ntlm.c	24 Dec 2003 16:28:29 -0000	1.18.2.1.4.7
+++ squid/src/auth/ntlm/auth_ntlm.c	3 Jan 2004 14:55:54 -0000	1.18.2.1.4.8
@@ -201,6 +201,11 @@
     if (ntlmConfig->use_ntlm_negotiate && ntlmConfig->challengeuses > 0) 
         ntlmConfig->challengeuses = 0;
 
+/* Native Windows helpers don't allow Challenge reuse */
+#ifdef _SQUID_MSWIN_
+    if (ntlmConfig->challengeuses > 0)
+        ntlmConfig->challengeuses = 0;
+#endif
 }
 
 
@@ -655,7 +660,11 @@
 	debug(29, 5) ("authenticateNTLMChangeChallenge_p: first use\n");
 	return 0;
     }
+#ifdef _SQUID_MSWIN_
+    {
+#else
     if ((helperstate->challengeuses > ntlmConfig->challengeuses) || ntlmConfig->use_ntlm_negotiate) {
+#endif
 	debug(29, 4) ("authenticateNTLMChangeChallenge_p: Challenge uses (%d) exceeded max uses (%d)\n", helperstate->challengeuses, ntlmConfig->challengeuses);
 	return 1;
     }