Index: makefile.in
===================================================================
RCS file: /cvsroot/squid/squid/makefile.in,v
retrieving revision 1.4
diff -u -r1.4 makefile.in
--- makefile.in	2001/01/07 23:53:34	1.4
+++ makefile.in	2001/01/08 13:03:29
@@ -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
 
@@ -37,8 +37,6 @@
 almostclean: clean
 	rm -f config.log makefile
 	rm -f include/paths.h include/autoconf.h include/config.h
-	rm -f auth_modules/dummy
-	rm -f ntlm_auth_modules/dummy
 	@for dir in $(SUBDIRS) contrib; do \
 		echo Making distclean in $$dir; \
 		(cd $$dir; $(MAKE) $(MFLAGS) prefix="$(prefix)" distclean); \
Index: src/acl.c
===================================================================
RCS file: /cvsroot/squid/squid/src/acl.c,v
retrieving revision 1.12
diff -u -r1.12 acl.c
--- src/acl.c	2001/01/07 23:53:36	1.12
+++ src/acl.c	2001/01/08 13:03:39
@@ -641,12 +641,17 @@
     acl_user_data *data;
     splayNode *Top = NULL;
 
-    debug(28, 2) ("aclParseUserList: parsing authlist\n");
+    debug(28, 2) ("aclParseUserList: parsing user list\n");
     if (*current == NULL) {
 	debug(28, 3) ("aclParseUserList: current is null. Creating\n");
-	*current = memAllocate(MEM_ACL_USER_DATA);	/*we rely on mA. zeroing */
+	*current = memAllocate(MEM_ACL_USER_DATA);
+        data = *current;
+        data->names=NULL;
+        data->flags.case_insensitive=0;
+        data->flags.required=0;
     }
     data = *current;
+    Top = data->names;
     if ((t = strtokFile())) {
 	debug(28, 5) ("aclParseUserList: First token is %s\n", t);
 	if (strcmp("-i", t) == 0) {
@@ -665,7 +670,7 @@
 	data->flags.case_insensitive);
     /* we might inherit from a previous declaration */
 
-    debug(28, 4) ("aclParseUserList: parsing proxy-auth list\n");
+    debug(28, 4) ("aclParseUserList: parsing user list\n");
     while ((t = strtokFile())) {
 	debug(28, 6) ("aclParseUserList: Got token: %s\n", t);
 	if (data->flags.case_insensitive)
@@ -1977,7 +1982,8 @@
 aclFreeUserData(void *data)
 {
     acl_user_data *d = data;
-    splay_destroy(d->names, xfree);
+    if (d->names)
+        splay_destroy(d->names, xfree);
     memFree(d, MEM_ACL_USER_DATA);
 }
 
Index: src/authenticate.c
===================================================================
RCS file: /cvsroot/squid/squid/src/authenticate.c,v
retrieving revision 1.6
diff -u -r1.6 authenticate.c
--- src/authenticate.c	2001/01/07 23:53:36	1.6
+++ src/authenticate.c	2001/01/08 13:03:39
@@ -370,7 +370,8 @@
 	    authscheme_list[i].donefunc();
 	else
 	    debug(29, 2) ("authenticateShutdown: scheme %s has not registered a shutdown function.\n", authscheme_list[i].typestr);
-	authscheme_list[i].typestr = NULL;
+        if (!reconfiguring)
+	    authscheme_list[i].typestr = NULL;
     }
 }
 
@@ -634,6 +635,7 @@
 authSchemeAdd(char *type, AUTHSSETUP * setup)
 {
     int i;
+    debug(29,4)("authSchemeAdd: adding %s",type);
     /* find the number of currently known authscheme types */
     for (i = 0; authscheme_list && authscheme_list[i].typestr; i++) {
 	assert(strcmp(authscheme_list[i].typestr, type) != 0);
Index: src/typedefs.h
===================================================================
RCS file: /cvsroot/squid/squid/src/typedefs.h,v
retrieving revision 1.9
diff -u -r1.9 typedefs.h
--- src/typedefs.h	2001/01/07 23:53:37	1.9
+++ src/typedefs.h	2001/01/08 13:03:41
@@ -61,7 +61,6 @@
 typedef struct _acl_time_data acl_time_data;
 typedef struct _acl_name_list acl_name_list;
 typedef struct _acl_deny_info_list acl_deny_info_list;
-typedef struct _acl_proxy_auth acl_proxy_auth;
 typedef struct _auth_user_t auth_user_t;
 typedef struct _auth_user_request_t auth_user_request_t;
 typedef struct _auth_user_hash_pointer auth_user_hash_pointer;
Index: src/auth/ntlm/auth_ntlm.c
===================================================================
RCS file: /cvsroot/squid/squid/src/auth/ntlm/auth_ntlm.c,v
retrieving revision 1.2
diff -u -r1.2 auth_ntlm.c
--- src/auth/ntlm/auth_ntlm.c	2001/01/08 00:02:38	1.2
+++ src/auth/ntlm/auth_ntlm.c	2001/01/08 13:03:44
@@ -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 */