---------------------
PatchSet 5925 
Date: 2003/09/08 22:22:16
Author: serassio
Branch: nt-2_5
Tag: (none) 
Log:
Native Win32 NTLM helper: code cleanup

Members: 
	helpers/ntlm_auth/NTLMSSP-WIN32/libntlmssp.c:1.1.4.3->1.1.4.4 
	helpers/ntlm_auth/NTLMSSP-WIN32/ntlm.h:1.1.4.5->1.1.4.6 
	helpers/ntlm_auth/NTLMSSP-WIN32/ntlm_auth.c:1.1.4.7->1.1.4.8 

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.3
retrieving revision 1.1.4.4
diff -u -r1.1.4.3 -r1.1.4.4
--- squid/helpers/ntlm_auth/NTLMSSP-WIN32/libntlmssp.c	7 Sep 2003 17:17:35 -0000	1.1.4.3
+++ squid/helpers/ntlm_auth/NTLMSSP-WIN32/libntlmssp.c	8 Sep 2003 22:22:16 -0000	1.1.4.4
@@ -302,7 +302,7 @@
 	NEGOTIATE_ASCII |
 	0
 	);
-    encoded = base64_encode_bin((char *) &ne, NEGOTIATE_LEGTH);
+    encoded = base64_encode_bin((char *) &ne, NEGOTIATE_LENGTH);
     return encoded;
 }
 
Index: squid/helpers/ntlm_auth/NTLMSSP-WIN32/ntlm.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/helpers/ntlm_auth/NTLMSSP-WIN32/Attic/ntlm.h,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -r1.1.4.5 -r1.1.4.6
--- squid/helpers/ntlm_auth/NTLMSSP-WIN32/ntlm.h	8 Sep 2003 20:22:16 -0000	1.1.4.5
+++ squid/helpers/ntlm_auth/NTLMSSP-WIN32/ntlm.h	8 Sep 2003 22:22:16 -0000	1.1.4.6
@@ -98,7 +98,7 @@
 #define NTLM_NOT_CONNECTED SEC_E_SECPKG_NOT_FOUND
 #define NTLM_BAD_NTGROUP -1
 
-#define NEGOTIATE_LEGTH 16
+#define NEGOTIATE_LENGTH 16
 
 extern void uc(char *);
 
Index: squid/helpers/ntlm_auth/NTLMSSP-WIN32/ntlm_auth.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/helpers/ntlm_auth/NTLMSSP-WIN32/Attic/ntlm_auth.c,v
retrieving revision 1.1.4.7
retrieving revision 1.1.4.8
diff -u -r1.1.4.7 -r1.1.4.8
--- squid/helpers/ntlm_auth/NTLMSSP-WIN32/ntlm_auth.c	8 Sep 2003 20:22:16 -0000	1.1.4.7
+++ squid/helpers/ntlm_auth/NTLMSSP-WIN32/ntlm_auth.c	8 Sep 2003 22:22:16 -0000	1.1.4.8
@@ -177,6 +177,7 @@
 	    debug_enabled = 1;
 	    break;
 	case 'v':
+	    debug_enabled = 1;
 	    NTLM_packet_debug_enabled = 1;
 	    break;
 	case 'h':
@@ -274,19 +275,20 @@
 	case NTLM_NEGOTIATE:
 	    /* Obtain challenge against SSPI */
 #if FAKE_NEGOTIATE
-            plen = NEGOTIATE_LEGTH;
+            plen = NEGOTIATE_LENGTH;
 #else
 	    plen = (strlen(buf) - 3) * 3 / 4;		/* we only need it here. Optimization */
 #endif
             if ((c = (char *) obtain_challenge((ntlm_negotiate *) decoded, plen)) != NULL )
             {
                 if (NTLM_packet_debug_enabled) {
+                    printf("TT %s\n",c);
                     decoded = base64_decode(c);
-	            debug("sending 'TT' with data:\n");
+	            debug("sending 'TT' to squid with data:\n");
                     hex_dump(decoded, (strlen(c) * 3) / 4);
-                    printf("TT %s\n",c);
-                } else
+                } else {
                	    SEND2("TT %s", c);
+                }
                 have_challenge = 1;
             } else
                 helperfail("can't obtain challenge");