---------------------
PatchSet 8059 
Date: 2006/05/28 15:58:49
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fixed merge error

Members: 
	src/auth/ntlm/auth_ntlm.c:1.26.2.1->1.26.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.26.2.1
retrieving revision 1.26.2.2
diff -u -r1.26.2.1 -r1.26.2.2
--- squid/src/auth/ntlm/auth_ntlm.c	16 May 2006 21:06:06 -0000	1.26.2.1
+++ squid/src/auth/ntlm/auth_ntlm.c	28 May 2006 15:58:49 -0000	1.26.2.2
@@ -224,7 +224,7 @@
 	    ntlmauthenticators = helperStatefulCreate("ntlmauthenticator");
 	ntlmauthenticators->cmdline = ntlmConfig->authenticate;
 	ntlmauthenticators->n_to_start = ntlmConfig->authenticateChildren;
-	ntlmauthenticators->ipc_type = IPC_TCP_SOCKET;
+	ntlmauthenticators->ipc_type = IPC_STREAM;
 	helperStatefulOpenServers(ntlmauthenticators);
 	if (!ntlminit) {
 	    cachemgrRegister("ntlmauthenticator",