---------------------
PatchSet 1218 
Date: 2001/01/09 13:38:33
Author: rbcollins
Branch: auth_digest
Tag: (none) 
Log:
ntlm fix that hadn't merged down

Members: 
	src/auth/ntlm/auth_ntlm.c:1.1.2.16.2.2->1.1.2.16.2.3 

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.2
retrieving revision 1.1.2.16.2.3
diff -u -r1.1.2.16.2.2 -r1.1.2.16.2.3
--- squid/src/auth/ntlm/auth_ntlm.c	9 Jan 2001 13:14:37 -0000	1.1.2.16.2.2
+++ squid/src/auth/ntlm/auth_ntlm.c	9 Jan 2001 13:38:33 -0000	1.1.2.16.2.3
@@ -246,10 +246,11 @@
 int
 authenticateNTLMActive()
 {
-    if (authntlm_initialised)
-	return 1;
-    else
-	return 0;
+    if ((ntlmConfig != NULL) && (ntlmConfig->authenticate != NULL) &&
+        (ntlmConfig->authenticateChildren != 0) && (ntlmConfig->challengeuses > -1)
+        && (ntlmConfig->challengelifetime>-1))
+        return 1;
+    return 0;
 }
 
 /* NTLM Scheme */