---------------------
PatchSet 2611 
Date: 2001/07/12 10:12:41
Author: rbcollins
Branch: ntlm
Tag: (none) 
Log:
backing out previous change - incorrect fix

Members: 
	src/auth/ntlm/auth_ntlm.c:1.1.10.14.2.21->1.1.10.14.2.22 

Index: squid/src/auth/ntlm/auth_ntlm.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/auth/ntlm/auth_ntlm.c,v
retrieving revision 1.1.10.14.2.21
retrieving revision 1.1.10.14.2.22
diff -u -r1.1.10.14.2.21 -r1.1.10.14.2.22
--- squid/src/auth/ntlm/auth_ntlm.c	12 Jul 2001 09:28:11 -0000	1.1.10.14.2.21
+++ squid/src/auth/ntlm/auth_ntlm.c	12 Jul 2001 10:12:41 -0000	1.1.10.14.2.22
@@ -358,20 +358,17 @@
 		debug(29, 9) ("authenticateNTLMFixErrorHeader: Sending type:%d header: 'NTLM %s'\n", type, ntlm_request->authchallenge);
 		httpHeaderPutStrf(&rep->header, type, "NTLM %s", ntlm_request->authchallenge);
 		break;
-	    case AUTHENTICATE_STATE_DONE:
+#ifdef KINKIES_407_HACK
+	    case AUTHENTICATE_STATE_DONE:	/* HACK by Kinkie */
 		/* we are here because we are about to force re-authentication.
-		 * If the client is disallowed by username,
-		 * They will be prompted for credentials again.
 		 * force the client to re-connect. 
 		 */
-		debug(29, 9) ("authenticateNTLMFixErrorHeader: Sending type:%d header: 'NTLM'\n", type);
-		httpHeaderPutStrf(&rep->header, type, "NTLM");
-                /* drop the connection */
 		httpHeaderDelByName(&rep->header, "keep-alive");
 		/* NTLM has problems if the initial connection is not dropped
 		 * I haven't checked the RFC compliance of this hack - RBCollins */
 		request->flags.proxy_keepalive = 0;
 		break;
+#endif /* KINKIES_407_HACK */
 	    default:
 		debug(29, 0) ("authenticateNTLMFixErrorHeader: state %d.\n", ntlm_request->auth_state);
 		fatal("unexpected state in AuthenticateNTLMFixErrorHeader.\n");