---------------------
PatchSet 5940 
Date: 2003/09/14 17:12:33
Author: serassio
Branch: nt-2_5
Tag: (none) 
Log:
Added selection for NTLM true NEGOTIATE support to configure

Members: 
	configure.in:1.42.2.5.4.44->1.42.2.5.4.45 
	port/win32/include/autoconf.h:1.1.2.32->1.1.2.33 
	src/auth/ntlm/auth_ntlm.c:1.18.2.1.4.4->1.18.2.1.4.5 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.42.2.5.4.44
retrieving revision 1.42.2.5.4.45
diff -u -r1.42.2.5.4.44 -r1.42.2.5.4.45
--- squid/configure.in	13 Sep 2003 14:39:23 -0000	1.42.2.5.4.44
+++ squid/configure.in	14 Sep 2003 17:12:33 -0000	1.42.2.5.4.45
@@ -3,7 +3,7 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.42.2.5.4.44 2003/09/13 14:39:23 serassio Exp $
+dnl  $Id: configure.in,v 1.42.2.5.4.45 2003/09/14 17:12:33 serassio Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 2.5.STABLE3-NT-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.42.2.5.4.44 $)dnl
+AC_REVISION($Revision: 1.42.2.5.4.45 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -59,7 +59,6 @@
 mingw|mingw32)
         AM_CONDITIONAL(ENABLE_MINGW32SPECIFIC, true)
 	AC_PATH_PROG(WIN32_PSAPI, psapi.dll, none)
-	AC_DEFINE(NTLM_TRUE_NEGOTIATE)
 	CFLAGS="$CFLAGS -mthreads"
 	if test "$ac_cv_path_WIN32_PSAPI" = "none"; then
 		echo "PSAPI.DLL is recommended to run Squid on Windows NT Platform"
@@ -1060,6 +1059,15 @@
   fi
 ])
 
+dnl Enable "NTLM True NEGOTIATE"
+AC_ARG_ENABLE(ntlm-true-negotiate,
+[  --enable-true-negotiate Enable NTLM true NEGOTIATE, where Squid sends to NTLM
+                          helpers the full NTLM NEGOTIATE packet.],
+[ if test "$enableval" = "yes" ; then
+    AC_DEFINE(NTLM_TRUE_NEGOTIATE)
+  fi
+])
+
 dnl Select external_acl helpers to build
 EXTERNAL_ACL_HELPERS=
 AC_ARG_ENABLE(external-acl-helpers,
Index: squid/port/win32/include/autoconf.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/port/win32/include/Attic/autoconf.h,v
retrieving revision 1.1.2.32
retrieving revision 1.1.2.33
diff -u -r1.1.2.32 -r1.1.2.33
--- squid/port/win32/include/autoconf.h	13 Sep 2003 14:39:24 -0000	1.1.2.32
+++ squid/port/win32/include/autoconf.h	14 Sep 2003 17:12:35 -0000	1.1.2.33
@@ -22,7 +22,7 @@
  *
  */
 
-/* $Id: autoconf.h,v 1.1.2.32 2003/09/13 14:39:24 serassio Exp $ */
+/* $Id: autoconf.h,v 1.1.2.33 2003/09/14 17:12:35 serassio Exp $ */
 
 /*
  * configure command line used to configure Squid
@@ -157,7 +157,6 @@
 
 /* Define if NTLM is allowed to pass NEGOTIATE packet to helpers */
 #undef NTLM_TRUE_NEGOTIATE
-#define NTLM_TRUE_NEGOTIATE 1
 
 /*
  * Define Windows NT & Windows 2000 run service mode
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.4
retrieving revision 1.18.2.1.4.5
diff -u -r1.18.2.1.4.4 -r1.18.2.1.4.5
--- squid/src/auth/ntlm/auth_ntlm.c	13 Sep 2003 14:39:24 -0000	1.18.2.1.4.4
+++ squid/src/auth/ntlm/auth_ntlm.c	14 Sep 2003 17:12:35 -0000	1.18.2.1.4.5
@@ -647,7 +647,7 @@
 	debug(29, 5) ("authenticateNTLMChangeChallenge_p: first use\n");
 	return 0;
     }
-#if NTLM_TRUE_NEGOTIATE
+#if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_)
     {
 #else
     if (helperstate->challengeuses > ntlmConfig->challengeuses) {