---------------------
PatchSet 1189 
Date: 2001/01/08 01:28:54
Author: rbcollins
Branch: auth_rewrite
Tag: (none) 
Log:
bugfixes - active() in ntlm and a invalid reference in makefile.in

Members: 
	makefile.in:1.1.1.3.10.3.2.3->1.1.1.3.10.3.2.4 
	src/auth/ntlm/auth_ntlm.c:1.1.2.21->1.1.2.22 

Index: squid/makefile.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/Attic/makefile.in,v
retrieving revision 1.1.1.3.10.3.2.3
retrieving revision 1.1.1.3.10.3.2.4
diff -u -r1.1.1.3.10.3.2.3 -r1.1.1.3.10.3.2.4
--- squid/makefile.in	7 Jan 2001 14:52:20 -0000	1.1.1.3.10.3.2.3
+++ squid/makefile.in	8 Jan 2001 01:28:54 -0000	1.1.1.3.10.3.2.4
@@ -1,4 +1,4 @@
-# $Id: makefile.in,v 1.1.1.3.10.3.2.3 2001/01/07 14:52:20 rbcollins Exp $
+# $Id: makefile.in,v 1.1.1.3.10.3.2.4 2001/01/08 01:28:54 rbcollins Exp $
 #
 
 srcdir		= @srcdir@
@@ -14,7 +14,7 @@
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 
-SUBDIRS		= lib @makesnmplib@ scripts src icons errors auth_modules
+SUBDIRS		= lib @makesnmplib@ scripts src icons errors 
 
 noargs: all
 
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.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- squid/src/auth/ntlm/auth_ntlm.c	8 Jan 2001 00:14:57 -0000	1.1.2.21
+++ squid/src/auth/ntlm/auth_ntlm.c	8 Jan 2001 01:28:55 -0000	1.1.2.22
@@ -235,10 +235,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 */