---------------------
PatchSet 7147 
Date: 2005/10/30 13:04:36
Author: serassio
Branch: negotiate-nt-2_5
Tag: (none) 
Log:
Fixed NTLM fallback in Negotiate helper

Members: 
	helpers/negotiate_auth/Win32/libnegotiatessp.c:1.1.2.1->1.1.2.2 
	helpers/ntlm_auth/NTLMSSP-WIN32/libntlmssp.c:1.1.4.11.2.1->1.1.4.11.2.2 
	include/sspwin32.h:1.1.4.4.2.1->1.1.4.4.2.2 

Index: squid/helpers/negotiate_auth/Win32/libnegotiatessp.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/helpers/negotiate_auth/Win32/Attic/libnegotiatessp.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- squid/helpers/negotiate_auth/Win32/libnegotiatessp.c	22 Oct 2005 17:45:23 -0000	1.1.2.1
+++ squid/helpers/negotiate_auth/Win32/libnegotiatessp.c	30 Oct 2005 13:04:36 -0000	1.1.2.2
@@ -30,6 +30,9 @@
      * (in a single line of course)
      */
 
+    if (!data)
+        return;
+
     if (debug_enabled) {
         unsigned char *p = data;
         unsigned char c;
Index: squid/helpers/ntlm_auth/NTLMSSP-WIN32/libntlmssp.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/helpers/ntlm_auth/NTLMSSP-WIN32/Attic/libntlmssp.c,v
retrieving revision 1.1.4.11.2.1
retrieving revision 1.1.4.11.2.2
diff -u -r1.1.4.11.2.1 -r1.1.4.11.2.2
--- squid/helpers/ntlm_auth/NTLMSSP-WIN32/libntlmssp.c	22 Oct 2005 17:45:23 -0000	1.1.4.11.2.1
+++ squid/helpers/ntlm_auth/NTLMSSP-WIN32/libntlmssp.c	30 Oct 2005 13:04:37 -0000	1.1.4.11.2.2
@@ -329,6 +329,9 @@
      * (in a single line of course)
      */
 
+    if (!data)
+        return;
+
     if (debug_enabled) {
         unsigned char *p = data;
         unsigned char c;
Index: squid/include/sspwin32.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/sspwin32.h,v
retrieving revision 1.1.4.4.2.1
retrieving revision 1.1.4.4.2.2
diff -u -r1.1.4.4.2.1 -r1.1.4.4.2.2
--- squid/include/sspwin32.h	22 Oct 2005 17:47:59 -0000	1.1.4.4.2.1
+++ squid/include/sspwin32.h	30 Oct 2005 13:04:37 -0000	1.1.4.4.2.2
@@ -41,7 +41,7 @@
 
 #define SSP_MAX_CRED_LEN 848
 
-#define SSP_DEBUG 1
+#define SSP_DEBUG 0
 
 #define SSP_OK 1
 #define SSP_ERROR 2