--------------------- PatchSet 1211 Date: 2001/01/09 12:19:13 Author: rbcollins Branch: auth_rewrite Tag: (none) Log: fix shutdown NULL references Members: src/auth/ntlm/auth_ntlm.c:1.1.2.22->1.1.2.23 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.22 retrieving revision 1.1.2.23 diff -u -r1.1.2.22 -r1.1.2.23 --- squid/src/auth/ntlm/auth_ntlm.c 8 Jan 2001 01:28:55 -0000 1.1.2.22 +++ squid/src/auth/ntlm/auth_ntlm.c 9 Jan 2001 12:19:13 -0000 1.1.2.23 @@ -94,19 +94,30 @@ void authNTLMDone(void) { -// memPoolDestroy(ufs_state_pool); - if (ntlmauthenticators) helperStatefulShutdown(ntlmauthenticators); authntlm_initialised = 0; if (!shutting_down) return; - helperStatefulFree(ntlmauthenticators); + if (ntlmauthenticators) + helperStatefulFree(ntlmauthenticators); ntlmauthenticators = NULL; - memPoolDestroy(ntlm_helper_state_pool); - memPoolDestroy(ntlm_request_pool); - memPoolDestroy(ntlm_user_pool); - + if (ntlm_helper_state_pool) + { + memPoolDestroy(ntlm_helper_state_pool); + ntlm_helper_state_pool = NULL; + } + if (ntlm_request_pool) + { + memPoolDestroy(ntlm_request_pool); + ntlm_request_pool = NULL; + } + if (ntlm_user_pool) + { + memPoolDestroy(ntlm_user_pool); + ntlm_user_pool = NULL; + } + debug(29,2)("authNTLMDone: NTLM authentication Shutdown.\n"); } /* free any allocated configuration details */