---------------------
PatchSet 6387 
Date: 2005/01/13 23:58:28
Author: squidadm
Branch: negotiate-2_5
Tag: (none) 
Log:
Merge conflict

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

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.2
retrieving revision 1.18.2.14.2.3
diff -u -r1.18.2.14.2.2 -r1.18.2.14.2.3
--- squid/src/auth/ntlm/auth_ntlm.c	13 Jan 2005 09:21:02 -0000	1.18.2.14.2.2
+++ squid/src/auth/ntlm/auth_ntlm.c	13 Jan 2005 23:58:28 -0000	1.18.2.14.2.3
@@ -647,7 +647,7 @@
 	fatal("Incorrect scheme in auth header\n");
 	/* TODO: more fault tolerance.. reset the auth scheme here */
     }
-    blob = proxy_auth + 10;
+    blob = proxy_auth + 5;
     while (xisspace(*blob))      /*trim leading spaces */
 	blob++;