--------------------- PatchSet 1257 Date: 2001/01/10 12:08:29 Author: rbcollins Branch: auth_digest Tag: (none) Log: tidyup Members: src/auth/digest/helpers/password/digest_pw_auth.c:1.1.2.2->1.1.2.3 src/auth/ntlm/auth_ntlm.c:1.1.2.16.2.6->1.1.2.16.2.7 Index: squid/src/auth/digest/helpers/password/digest_pw_auth.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/auth/digest/helpers/password/Attic/digest_pw_auth.c,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid/src/auth/digest/helpers/password/digest_pw_auth.c 10 Jan 2001 12:02:42 -0000 1.1.2.2 +++ squid/src/auth/digest/helpers/password/digest_pw_auth.c 10 Jan 2001 12:08:29 -0000 1.1.2.3 @@ -139,11 +139,11 @@ continue; } if ((realm = strtok(NULL, "\"")) == NULL) { - printf("ERR1\n"); + printf("ERR\n"); continue; } if ((realm = strtok(NULL, "\"")) == NULL) { - printf("ERR2\n"); + printf("ERR\n"); continue; } u = hash_lookup(hash, user); 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.16.2.6 retrieving revision 1.1.2.16.2.7 diff -u -r1.1.2.16.2.6 -r1.1.2.16.2.7 --- squid/src/auth/ntlm/auth_ntlm.c 10 Jan 2001 07:19:58 -0000 1.1.2.16.2.6 +++ squid/src/auth/ntlm/auth_ntlm.c 10 Jan 2001 12:08:30 -0000 1.1.2.16.2.7 @@ -247,7 +247,7 @@ authenticateNTLMActive() { if ((ntlmConfig != NULL) && (ntlmConfig->authenticate != NULL) && - (ntlmConfig->authenticateChildren != 0) && (ntlmConfig->challengeuses > -1) + (ntlmConfig->authenticateChildren != 0) && (ntlmConfig->challengeuses > -1) && (ntlmConfig->challengelifetime>-1)) return 1; return 0;