---------------------
PatchSet 6151 
Date: 2004/02/19 10:56:03
Author: serassio
Branch: nt-2_5
Tag: (none) 
Log:
Clean-up of old NTLM NEGOTIATE support tricks no more needed

Members: 
	src/auth/ntlm/auth_ntlm.c:1.18.2.1.4.9->1.18.2.1.4.10 
	src/fs/aufs/async_io.c:1.7.6.1.4.4->1.7.6.1.4.5 

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.9
retrieving revision 1.18.2.1.4.10
diff -u -r1.18.2.1.4.9 -r1.18.2.1.4.10
--- squid/src/auth/ntlm/auth_ntlm.c	6 Feb 2004 20:56:10 -0000	1.18.2.1.4.9
+++ squid/src/auth/ntlm/auth_ntlm.c	19 Feb 2004 10:56:03 -0000	1.18.2.1.4.10
@@ -197,16 +197,20 @@
      */
     if (ntlmConfig->authenticate && Config.onoff.pipeline_prefetch != 0)
 	Config.onoff.pipeline_prefetch = 0;
-    
+
     if (ntlmConfig->use_ntlm_negotiate && ntlmConfig->challengeuses > 0) {
 	debug(28, 1) ("challenge reuses incompatible with use_ntlm_negotiate. Disabling challenge reuse\n");
 	ntlmConfig->challengeuses = 0;
     }
 
-/* Native Windows helpers don't allow Challenge reuse */
-#ifdef _SQUID_MSWIN_
-    if (ntlmConfig->challengeuses > 0)
+    /* Native Windows helpers don't allow Challenge reuse even when
+     * running without NTLM NEGOTIATE packet support.
+     */
+#if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_)
+    if (ntlmConfig->challengeuses > 0) {
+	debug(28, 1) ("challenge reuses incompatible with Windows platform. Disabling challenge reuse\n");
         ntlmConfig->challengeuses = 0;
+    }
 #endif
 }
 
@@ -626,11 +630,7 @@
 	debug(29, 5) ("authenticateNTLMChangeChallenge_p: first use\n");
 	return 0;
     }
-#ifdef _SQUID_MSWIN_
-    {
-#else
-    if ((helperstate->challengeuses > ntlmConfig->challengeuses) || ntlmConfig->use_ntlm_negotiate) {
-#endif
+    if (helperstate->challengeuses > ntlmConfig->challengeuses) {
 	debug(29, 4) ("authenticateNTLMChangeChallenge_p: Challenge uses (%d) exceeded max uses (%d)\n", helperstate->challengeuses, ntlmConfig->challengeuses);
 	return 1;
     }
Index: squid/src/fs/aufs/async_io.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fs/aufs/async_io.c,v
retrieving revision 1.7.6.1.4.4
retrieving revision 1.7.6.1.4.5
diff -u -r1.7.6.1.4.4 -r1.7.6.1.4.5
--- squid/src/fs/aufs/async_io.c	9 Feb 2003 19:22:45 -0000	1.7.6.1.4.4
+++ squid/src/fs/aufs/async_io.c	19 Feb 2004 10:56:14 -0000	1.7.6.1.4.5
@@ -88,6 +88,7 @@
 	fd_close(fd);
 }
 
+
 void
 aioInit(void)
 {