---------------------
PatchSet 7149 
Date: 2005/11/01 14:35:09
Author: serassio
Branch: negotiate-nt-2_5
Tag: (none) 
Log:
NTLM code cleanup

Members: 
	lib/sspwin32.c:1.1.4.7.2.1->1.1.4.7.2.2 
	src/helper.c:1.16.10.23.2.1->1.16.10.23.2.2 
	src/auth/ntlm/auth_ntlm.c:1.18.2.1.4.24.2.3->1.18.2.1.4.24.2.4 
	src/auth/ntlm/auth_ntlm.h:1.8.10.4.2.1->1.8.10.4.2.2 

Index: squid/lib/sspwin32.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/sspwin32.c,v
retrieving revision 1.1.4.7.2.1
retrieving revision 1.1.4.7.2.2
diff -u -r1.1.4.7.2.1 -r1.1.4.7.2.2
--- squid/lib/sspwin32.c	22 Oct 2005 17:47:44 -0000	1.1.4.7.2.1
+++ squid/lib/sspwin32.c	1 Nov 2005 14:35:09 -0000	1.1.4.7.2.2
@@ -367,7 +367,7 @@
 
     if ((credentials != NULL) && 
          !(SecurityStatus == SEC_I_CONTINUE_NEEDED || SecurityStatus == SEC_I_COMPLETE_AND_CONTINUE)) {
-        SecurityStatus = _QueryContextAttributes(&pAS->hctxt,  SECPKG_ATTR_NAMES, &namebuffer);
+        SecurityStatus = _QueryContextAttributes(&pAS->hctxt, SECPKG_ATTR_NAMES, &namebuffer);
 #if SSP_DEBUG
         fprintf(stderr, "QueryContextAttributes returned: %x\n", SecurityStatus);
 #endif
Index: squid/src/helper.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/helper.c,v
retrieving revision 1.16.10.23.2.1
retrieving revision 1.16.10.23.2.2
diff -u -r1.16.10.23.2.1 -r1.16.10.23.2.2
--- squid/src/helper.c	30 Oct 2005 09:16:36 -0000	1.16.10.23.2.1
+++ squid/src/helper.c	1 Nov 2005 14:35:09 -0000	1.16.10.23.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: helper.c,v 1.16.10.23.2.1 2005/10/30 09:16:36 serassio Exp $
+ * $Id: helper.c,v 1.16.10.23.2.2 2005/11/01 14:35:09 serassio Exp $
  *
  * DEBUG: section 84    Helper process maintenance
  * AUTHOR: Harvest Derived?
@@ -417,6 +417,8 @@
     helper_stateful_server *srv;
     dlink_node *link;
     double tt;
+    storeAppendPrintf(sentry, "program: %s\n",
+	hlp->cmdline->key);
     storeAppendPrintf(sentry, "number running: %d of %d\n",
 	hlp->n_running, hlp->n_to_start);
     storeAppendPrintf(sentry, "requests sent: %d\n",
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.24.2.3
retrieving revision 1.18.2.1.4.24.2.4
diff -u -r1.18.2.1.4.24.2.3 -r1.18.2.1.4.24.2.4
--- squid/src/auth/ntlm/auth_ntlm.c	30 Oct 2005 09:16:36 -0000	1.18.2.1.4.24.2.3
+++ squid/src/auth/ntlm/auth_ntlm.c	1 Nov 2005 14:35:09 -0000	1.18.2.1.4.24.2.4
@@ -140,7 +140,6 @@
     storeAppendPrintf(entry, "\n");
     storeAppendPrintf(entry, "%s %s children %d\n", name, "ntlm", config->authenticateChildren);
     storeAppendPrintf(entry, "%s %s keep_alive %s\n", name, "ntlm", config->keep_alive ? "on" : "off");
-    storeAppendPrintf(entry, "%s %s use_ntlm_negotiate %s\n", name, "ntlm", config->use_ntlm_negotiate ? "on" : "off");
 }
 
 static void
@@ -164,8 +163,6 @@
 	parse_int(&ntlmConfig->authenticateChildren);
     } else if (strcasecmp(param_str, "keep_alive") == 0) {
 	parse_onoff(&ntlmConfig->keep_alive);
-    } else if (strcasecmp(param_str, "use_ntlm_negotiate") == 0) {
-	parse_onoff(&ntlmConfig->use_ntlm_negotiate);
     } else {
 	debug(28, 0) ("unrecognised ntlm auth scheme parameter '%s'\n", param_str);
     }
@@ -526,10 +523,7 @@
     r->auth_user_request = auth_user_request;
     authenticateAuthUserRequestLock(r->auth_user_request);
     if (ntlm_request->auth_state == AUTHENTICATE_STATE_INITIAL) {
-	if (ntlmConfig->use_ntlm_negotiate)
-	    snprintf(buf, 8192, "YR %s\n", sent_string);
-	else
-	    snprintf(buf, 8192, "YR\n");
+        snprintf(buf, 8192, "YR %s\n", sent_string);
     } else {
 	snprintf(buf, 8192, "KK %s\n", sent_string);
     }
Index: squid/src/auth/ntlm/auth_ntlm.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/auth/ntlm/auth_ntlm.h,v
retrieving revision 1.8.10.4.2.1
retrieving revision 1.8.10.4.2.2
diff -u -r1.8.10.4.2.1 -r1.8.10.4.2.2
--- squid/src/auth/ntlm/auth_ntlm.h	8 Oct 2005 09:13:11 -0000	1.8.10.4.2.1
+++ squid/src/auth/ntlm/auth_ntlm.h	1 Nov 2005 14:35:09 -0000	1.8.10.4.2.2
@@ -48,7 +48,6 @@
 struct _auth_ntlm_config {
     int authenticateChildren;
     int keep_alive;
-    int use_ntlm_negotiate;
     wordlist *authenticate;
 };