--------------------- PatchSet 1435 Date: 2001/01/30 12:04:44 Author: rbcollins Branch: auth_rewrite Tag: (none) Log: bugfix: on reconfigure discard existing wordlists for auth scheme configs Members: src/auth/basic/auth_basic.c:1.1.2.30->1.1.2.31 src/auth/digest/auth_digest.c:1.1.20.1->1.1.20.2 src/auth/ntlm/auth_ntlm.c:1.1.2.30->1.1.2.31 Index: squid/src/auth/basic/auth_basic.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/auth/basic/auth_basic.c,v retrieving revision 1.1.2.30 retrieving revision 1.1.2.31 diff -u -r1.1.2.30 -r1.1.2.31 --- squid/src/auth/basic/auth_basic.c 23 Jan 2001 22:54:53 -0000 1.1.2.30 +++ squid/src/auth/basic/auth_basic.c 30 Jan 2001 12:04:44 -0000 1.1.2.31 @@ -327,6 +327,8 @@ } basicConfig = scheme->scheme_data; if (strcasecmp(param_str, "program") == 0) { + if (basicConfig->authenticate) + wordlistDestroy(&basicConfig->authenticate); parse_wordlist(&basicConfig->authenticate); requirePathnameExists("authparam basic program", basicConfig->authenticate->key); } else if (strcasecmp(param_str, "children") == 0) { Index: squid/src/auth/digest/auth_digest.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/auth/digest/auth_digest.c,v retrieving revision 1.1.20.1 retrieving revision 1.1.20.2 diff -u -r1.1.20.1 -r1.1.20.2 --- squid/src/auth/digest/auth_digest.c 23 Jan 2001 22:54:53 -0000 1.1.20.1 +++ squid/src/auth/digest/auth_digest.c 30 Jan 2001 12:04:45 -0000 1.1.20.2 @@ -928,6 +928,8 @@ digestConfig=scheme->scheme_data; if (strcasecmp(param_str,"program")==0) { + if (digestConfig->authenticate) + wordlistDestroy(&digestConfig->authenticate); parse_wordlist(&digestConfig->authenticate); requirePathnameExists("authparam digest program",digestConfig->authenticate->key); } 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.2.30 retrieving revision 1.1.2.31 diff -u -r1.1.2.30 -r1.1.2.31 --- squid/src/auth/ntlm/auth_ntlm.c 23 Jan 2001 22:54:54 -0000 1.1.2.30 +++ squid/src/auth/ntlm/auth_ntlm.c 30 Jan 2001 12:04:45 -0000 1.1.2.31 @@ -167,6 +167,8 @@ } ntlmConfig = scheme->scheme_data; if (strcasecmp(param_str, "program") == 0) { + if (ntlmConfig->authenticate) + wordlistDestroy(&ntlmConfig->authenticate); parse_wordlist(&ntlmConfig->authenticate); requirePathnameExists("authparam ntlm program", ntlmConfig->authenticate->key); } else if (strcasecmp(param_str, "children") == 0) {