---------------------
PatchSet 1201 
Date: 2001/01/08 12:46:52
Author: rbcollins
Branch: auth_rewrite
Tag: (none) 
Log:
unused code removal

Members: 
	src/acl.c:1.1.1.3.12.26.2.30->1.1.1.3.12.26.2.31 
	src/cache_cf.c:1.1.1.3.4.1.2.9.2.16->1.1.1.3.4.1.2.9.2.17 
	src/enums.h:1.1.1.3.12.15.2.9->1.1.1.3.12.15.2.10 
	src/redirect.c:1.1.1.3.4.1.2.2.2.4->1.1.1.3.4.1.2.2.2.5 

Index: squid/src/acl.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/acl.c,v
retrieving revision 1.1.1.3.12.26.2.30
retrieving revision 1.1.1.3.12.26.2.31
diff -u -r1.1.1.3.12.26.2.30 -r1.1.1.3.12.26.2.31
--- squid/src/acl.c	8 Jan 2001 10:16:31 -0000	1.1.1.3.12.26.2.30
+++ squid/src/acl.c	8 Jan 2001 12:46:52 -0000	1.1.1.3.12.26.2.31
@@ -1,6 +1,6 @@
 
 /*
- * $Id: acl.c,v 1.1.1.3.12.26.2.30 2001/01/08 10:16:31 rbcollins Exp $
+ * $Id: acl.c,v 1.1.1.3.12.26.2.31 2001/01/08 12:46:52 rbcollins Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -1299,10 +1299,10 @@
 	    return
 		aclCacheMatchAcl(&auth_user_request->auth_user->proxy_match_cache,
 		acltype, data, authenticateUserRequestUsername(auth_user_request));
-	}
-	/* this acl check completed */
-	authenticateAuthUserRequestUnlock(auth_user_request);
-	return 0;
+    }
+    /* this acl check completed */
+    authenticateAuthUserRequestUnlock(auth_user_request);
+    return 0;
 }
 
 static void
Index: squid/src/cache_cf.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/cache_cf.c,v
retrieving revision 1.1.1.3.4.1.2.9.2.16
retrieving revision 1.1.1.3.4.1.2.9.2.17
diff -u -r1.1.1.3.4.1.2.9.2.16 -r1.1.1.3.4.1.2.9.2.17
--- squid/src/cache_cf.c	7 Jan 2001 09:48:30 -0000	1.1.1.3.4.1.2.9.2.16
+++ squid/src/cache_cf.c	8 Jan 2001 12:46:52 -0000	1.1.1.3.4.1.2.9.2.17
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.c,v 1.1.1.3.4.1.2.9.2.16 2001/01/07 09:48:30 hno Exp $
+ * $Id: cache_cf.c,v 1.1.1.3.4.1.2.9.2.17 2001/01/08 12:46:52 rbcollins Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -303,19 +303,6 @@
 	    Config.redirectChildren = DefaultRedirectChildrenMax;
 	}
     }
-#if 0
-    if (Config.Program.authenticate) {
-	if (Config.authenticateChildren < 1) {
-	    Config.authenticateChildren = 0;
-	    wordlistDestroy(&Config.Program.authenticate);
-	} else if (Config.authenticateChildren > DefaultAuthenticateChildrenMax) {
-	    debug(3, 0) ("WARNING: authenticate_children was set to a bad value: %d\n",
-		Config.authenticateChildren);
-	    debug(3, 0) ("Setting it to the maximum (%d).\n", DefaultAuthenticateChildrenMax);
-	    Config.authenticateChildren = DefaultAuthenticateChildrenMax;
-	}
-    }
-#endif
     if (Config.Accel.host) {
 	snprintf(buf, BUFSIZ, "http://%s:%d", Config.Accel.host, Config.Accel.port);
 	Config2.Accel.prefix = xstrdup(buf);
@@ -371,10 +358,6 @@
 #endif
     if (Config.Program.redirect)
 	requirePathnameExists("redirect_program", Config.Program.redirect->key);
-#if 0
-    if (Config.Program.authenticate)
-	requirePathnameExists("authenticate_program", Config.Program.authenticate->key);
-#endif
     requirePathnameExists("Icon Directory", Config.icons.directory);
     requirePathnameExists("Error Directory", Config.errorDirectory);
 #if HTTP_VIOLATIONS
Index: squid/src/enums.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/enums.h,v
retrieving revision 1.1.1.3.12.15.2.9
retrieving revision 1.1.1.3.12.15.2.10
diff -u -r1.1.1.3.12.15.2.9 -r1.1.1.3.12.15.2.10
--- squid/src/enums.h	7 Jan 2001 20:20:00 -0000	1.1.1.3.12.15.2.9
+++ squid/src/enums.h	8 Jan 2001 12:46:53 -0000	1.1.1.3.12.15.2.10
@@ -1,6 +1,6 @@
 
 /*
- * $Id: enums.h,v 1.1.1.3.12.15.2.9 2001/01/07 20:20:00 hno Exp $
+ * $Id: enums.h,v 1.1.1.3.12.15.2.10 2001/01/08 12:46:53 rbcollins Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -131,11 +131,6 @@
     ACL_LOOKUP_PENDING,
     ACL_LOOKUP_DONE,
     ACL_PROXY_AUTH_NEEDED,
-#if 0
-    ACL_HELPER_START,
-    ACL_HELPER_PENDING,
-    ACL_HELPER_DONE
-#endif
 } acl_lookup_state;
 
 enum {
Index: squid/src/redirect.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/redirect.c,v
retrieving revision 1.1.1.3.4.1.2.2.2.4
retrieving revision 1.1.1.3.4.1.2.2.2.5
diff -u -r1.1.1.3.4.1.2.2.2.4 -r1.1.1.3.4.1.2.2.2.5
--- squid/src/redirect.c	7 Jan 2001 09:48:31 -0000	1.1.1.3.4.1.2.2.2.4
+++ squid/src/redirect.c	8 Jan 2001 12:46:53 -0000	1.1.1.3.4.1.2.2.2.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: redirect.c,v 1.1.1.3.4.1.2.2.2.4 2001/01/07 09:48:31 hno Exp $
+ * $Id: redirect.c,v 1.1.1.3.4.1.2.2.2.5 2001/01/08 12:46:53 rbcollins Exp $
  *
  * DEBUG: section 29    Redirector
  * AUTHOR: Duane Wessels
@@ -126,10 +126,6 @@
     r = CBDATA_ALLOC(redirectStateData, NULL);
     r->orig_url = xstrdup(http->uri);
     r->client_addr = conn->log_addr;
-#if 0
-    if (http->request->authuser[0])
-	r->client_ident = http->request->authuser;
-#endif
     if (http->request->auth_user_request)
 	r->client_ident = authenticateUserRequestUsername(http->request->auth_user_request);
     else if (conn->rfc931[0]) {