---------------------
PatchSet 2707 
Date: 2001/08/02 14:34:11
Author: rbcollins
Branch: auth_rewrite
Tag: (none) 
Log:
prepared for HEAD merge

Members: 
	src/cf.data.pre:1.1.1.3.4.1.2.18.2.29->1.1.1.3.4.1.2.18.2.30 
	src/structs.h:1.1.1.3.4.1.2.26.2.41->1.1.1.3.4.1.2.26.2.42 

Index: squid/src/cf.data.pre
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/cf.data.pre,v
retrieving revision 1.1.1.3.4.1.2.18.2.29
retrieving revision 1.1.1.3.4.1.2.18.2.30
diff -u -r1.1.1.3.4.1.2.18.2.29 -r1.1.1.3.4.1.2.18.2.30
--- squid/src/cf.data.pre	31 Jul 2001 10:29:23 -0000	1.1.1.3.4.1.2.18.2.29
+++ squid/src/cf.data.pre	2 Aug 2001 14:34:11 -0000	1.1.1.3.4.1.2.18.2.30
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.1.1.3.4.1.2.18.2.29 2001/07/31 10:29:23 rbcollins Exp $
+# $Id: cf.data.pre,v 1.1.1.3.4.1.2.18.2.30 2001/08/02 14:34:11 rbcollins Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -1403,18 +1403,7 @@
 	the user to redial without hassle. If all your users are
 	stationary then higher values may be used.
 
-	See also authenticate_ip_ttl_is_strict
-DOC_END
-
-NAME: authenticate_ip_ttl_is_strict
-TYPE: onoff
-LOC: Config.onoff.authenticateIpTTLStrict
-DEFAULT: on
-DOC_START
-	This option makes authenticate_ip_ttl a bit stricter. With this
-	enabled authenticate_ip_ttl will deny all access from other IP
-	addresses until the TTL has expired, and the IP address "owning"
-	the userid will not be forced to reauthenticate.
+	See also the acl max_user_ip.
 DOC_END
 
 COMMENT_START
Index: squid/src/structs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/structs.h,v
retrieving revision 1.1.1.3.4.1.2.26.2.41
retrieving revision 1.1.1.3.4.1.2.26.2.42
diff -u -r1.1.1.3.4.1.2.26.2.41 -r1.1.1.3.4.1.2.26.2.42
--- squid/src/structs.h	2 Aug 2001 13:42:37 -0000	1.1.1.3.4.1.2.26.2.41
+++ squid/src/structs.h	2 Aug 2001 14:34:11 -0000	1.1.1.3.4.1.2.26.2.42
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.1.1.3.4.1.2.26.2.41 2001/08/02 13:42:37 rbcollins Exp $
+ * $Id: structs.h,v 1.1.1.3.4.1.2.26.2.42 2001/08/02 14:34:11 rbcollins Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -566,7 +566,6 @@
 	int digest_generation;
 #endif
 	int log_ip_on_direct;
-	int authenticateIpTTLStrict;
 	int ie_refresh;
 	int vary_ignore_expire;
 	int pipeline_prefetch;