--------------------- PatchSet 2564 Date: 2001/06/28 13:54:21 Author: kinkie Branch: ntlm Tag: (none) Log: Fixed a couple of bugs. Members: src/auth/ntlm/auth_ntlm.c:1.1.10.14.2.18->1.1.10.14.2.19 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.10.14.2.18 retrieving revision 1.1.10.14.2.19 diff -u -r1.1.10.14.2.18 -r1.1.10.14.2.19 --- squid/src/auth/ntlm/auth_ntlm.c 25 Jun 2001 14:39:27 -0000 1.1.10.14.2.18 +++ squid/src/auth/ntlm/auth_ntlm.c 28 Jun 2001 13:54:21 -0000 1.1.10.14.2.19 @@ -103,9 +103,9 @@ a = a->next; b = b->next; } - if (a &! b) + if (a && ! b) return -1; - if (b &! a) + if (b && ! a) return 1; return 0; } @@ -264,10 +264,9 @@ ntlmauthenticators->datapool = ntlm_helper_state_pool; ntlmauthenticators->IsAvailable = authenticateNTLMHelperServerAvailable; ntlmauthenticators->OnEmptyQueue = authenticateNTLMHelperServerOnEmpty; - if (wordliststrcmp(ntlmprevauthline, ntlmConfig->authenticate)) { + if (wordliststrcmp(ntlmprevauthline, ntlmConfig->authenticate)) { helperStatefulShutdown(ntlmauthenticators); helperStatefulOpenServers(ntlmauthenticators); - } else { if (ntlmprevauthline) wordlistDestroy (&ntlmprevauthline); ntlmprevauthline = wordlistDup (ntlmConfig->authenticate);