--------------------- PatchSet 6388 Date: 2005/01/14 00:14:57 Author: squidadm Branch: negotiate-2_5 Tag: (none) Log: Cleanup stateful auth config dump Members: src/auth/negotiate/auth_negotiate.c:1.1.2.1->1.1.2.2 src/auth/ntlm/auth_ntlm.c:1.18.2.14.2.3->1.18.2.14.2.4 Index: squid/src/auth/negotiate/auth_negotiate.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/auth/negotiate/auth_negotiate.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/src/auth/negotiate/auth_negotiate.c 12 Jan 2005 23:09:05 -0000 1.1.2.1 +++ squid/src/auth/negotiate/auth_negotiate.c 14 Jan 2005 00:14:57 -0000 1.1.2.2 @@ -1,6 +1,6 @@ /* - * $Id: auth_negotiate.c,v 1.1.2.1 2005/01/12 23:09:05 squidadm Exp $ + * $Id: auth_negotiate.c,v 1.1.2.2 2005/01/14 00:14:57 squidadm Exp $ * * DEBUG: section 29 Negotiate Authenticator * AUTHOR: Robert Collins @@ -133,13 +133,14 @@ { auth_negotiate_config *config = scheme->scheme_data; wordlist *list = config->authenticate; - storeAppendPrintf(entry, "%s %s", name, "negotiate"); + storeAppendPrintf(entry, "%s %s program", name, "negotiate"); while (list != NULL) { storeAppendPrintf(entry, " %s", list->key); list = list->next; } - storeAppendPrintf(entry, "\n%s %s children %d\n", name, "negotiate", config->authenticateChildren); - storeAppendPrintf(entry, "\n%s %s keep_alive %d\n", name, "negotiate", config->keep_alive); + storeAppendPrintf(entry, "\n"); + storeAppendPrintf(entry, "%s %s children %d\n", name, "negotiate", config->authenticateChildren); + storeAppendPrintf(entry, "%s %s keep_alive %d\n", name, "negotiate", config->keep_alive); } static void 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.3 retrieving revision 1.18.2.14.2.4 diff -u -r1.18.2.14.2.3 -r1.18.2.14.2.4 --- squid/src/auth/ntlm/auth_ntlm.c 13 Jan 2005 23:58:28 -0000 1.18.2.14.2.3 +++ squid/src/auth/ntlm/auth_ntlm.c 14 Jan 2005 00:14:58 -0000 1.18.2.14.2.4 @@ -132,7 +132,7 @@ { auth_ntlm_config *config = scheme->scheme_data; wordlist *list = config->authenticate; - storeAppendPrintf(entry, "%s %s", name, "ntlm"); + storeAppendPrintf(entry, "%s %s program", name, "ntlm"); while (list != NULL) { storeAppendPrintf(entry, " %s", list->key); list = list->next;