---------------------
PatchSet 6385 
Date: 2005/01/13 09:21:02
Author: squidadm
Branch: negotiate-2_5
Tag: (none) 
Log:
Merge conflicts

Members: 
	src/auth/ntlm/auth_ntlm.c:1.18.2.14.2.1->1.18.2.14.2.2 

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.14.2.1
retrieving revision 1.18.2.14.2.2
diff -u -r1.18.2.14.2.1 -r1.18.2.14.2.2
--- squid/src/auth/ntlm/auth_ntlm.c	12 Jan 2005 23:09:05 -0000	1.18.2.14.2.1
+++ squid/src/auth/ntlm/auth_ntlm.c	13 Jan 2005 09:21:02 -0000	1.18.2.14.2.2
@@ -329,7 +329,7 @@
 	break;
     case AUTHENTICATE_STATE_FINISHED:
 	/* Special case when authentication finished, but not allowed by ACL */
-	debug(29, 9) ("authenticateNTLMFixErrorHeader: Sending type:%d header: 'NTLM'\n", type, ntlm_request->server_blob);
+	debug(29, 9) ("authenticateNTLMFixErrorHeader: Sending type:%d header: 'NTLM'\n", type);
 	httpHeaderPutStrf(&rep->header, type, "NTLM");
 	break;
     default:
@@ -440,21 +440,21 @@
 	safe_free(auth_user_request->message);
 	auth_user_request->message = xstrdup("Authenication in progress");
 	debug(29, 4) ("authenticateNTLMHandleReply: Need to challenge the client with a server blob '%s'\n", blob);
-    } else if (strncasecmp(reply, "AF ", 3) == 0 && arg != NULL) {
+    } else if (strncasecmp(reply, "AF ", 3) == 0 && blob != NULL) {
 	/* we're finished, release the helper */
 	safe_free(ntlm_user->username);
 	ntlm_user->username = xstrdup(blob);
 	safe_free(auth_user_request->message);
 	auth_user_request->message = xstrdup("Login successful");
-	debug(29, 4) ("authenticateNTLMHandleReply: Successfully validated user via NTLM. Username '%s'\n", arg);
+	debug(29, 4) ("authenticateNTLMHandleReply: Successfully validated user via NTLM. Username '%s'\n", blob);
 	authenticateNTLMReleaseServer(ntlm_request);
 	ntlm_request->auth_state = AUTHENTICATE_STATE_FINISHED;
-    } else if (strncasecmp(reply, "NA ", 3) == 0 && arg != NULL) {
+    } else if (strncasecmp(reply, "NA ", 3) == 0 && blob != NULL) {
 	safe_free(auth_user_request->message);
 	auth_user_request->message = xstrdup(blob);
 	ntlm_request->auth_state = AUTHENTICATE_STATE_FAILED;
 	authenticateNTLMReleaseServer(ntlm_request);
-	debug(29, 4) ("authenticateNTLMHandleReply: Failed validating user via NTLM. Error returned '%s'\n", arg);
+	debug(29, 4) ("authenticateNTLMHandleReply: Failed validating user via NTLM. Error returned '%s'\n", blob);
     } else if (strncasecmp(reply, "BH ", 3) == 0) {
 	/* TODO kick off a refresh process. This can occur after a YR or after
 	 * a KK. If after a YR release the helper and resubmit the request via 
@@ -523,7 +523,7 @@
 	if (ntlmConfig->use_ntlm_negotiate)
 	    snprintf(buf, 8192, "YR %s\n", sent_string);
 	else
-	    snprintf(buf, 8192, "YR\n", sent_string);
+	    snprintf(buf, 8192, "YR\n");
     } else {
 	snprintf(buf, 8192, "KK %s\n", sent_string);
     }