---------------------
PatchSet 126 
Date: 2000/04/15 11:54:27
Author: asd
Branch: ntlm
Tag: (none) 
Log:
- Nuke ConnStateData::persistent. It doesn't do anything right now.
- No sane need for ConnStateData::authenticated to depend on USE_NTLM.

Members: 
	src/acl.c:1.1.1.3.12.1->1.1.1.3.12.2 
	src/stat.c:1.1.1.3->1.1.1.3.12.1 
	src/structs.h:1.1.1.3.4.1.2.2->1.1.1.3.4.1.2.3 

Index: squid/src/acl.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/acl.c,v
retrieving revision 1.1.1.3.12.1
retrieving revision 1.1.1.3.12.2
diff -u -r1.1.1.3.12.1 -r1.1.1.3.12.2
--- squid/src/acl.c	5 Feb 2000 20:14:18 -0000	1.1.1.3.12.1
+++ squid/src/acl.c	15 Apr 2000 11:54:27 -0000	1.1.1.3.12.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: acl.c,v 1.1.1.3.12.1 2000/02/05 20:14:18 hno Exp $
+ * $Id: acl.c,v 1.1.1.3.12.2 2000/04/15 11:54:27 asd Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -1092,11 +1092,9 @@
     LOCAL_ARRAY(char, login_buf, USER_IDENT_SZ);
     char *user, *password, rv;
 
-#if USE_NTLM
-    /* For NTLM we only ask for authentication on the first request */
+    /* Don't repeatedly ask for authentication on a persistent connection. */
     if (checklist->conn && checklist->conn->authenticated)
         return 1;
-#endif
 
     switch (aclDecodeProxyAuth(proxy_auth, &user, &password, login_buf, sizeof(login_buf))) {
 #if USE_NTLM
@@ -1165,13 +1163,12 @@
 	    /* copy username to request for logging on client-side */
 	    xstrncpy(checklist->request->user_ident, user, USER_IDENT_SZ);
 	    rv = aclMatchUser(data, user);
-#if USE_NTLM
-	    /* Copy the username from the NTLM header */
 	    if (checklist->conn) {
 		checklist->conn->authenticated = rv; /* XXX THIS IS NOT SAFE */
+#if USE_NTLM
 		xstrncpy(checklist->conn->ident, user, USER_IDENT_SZ);
-	    }
 #endif
+	    }
 	    return rv;
 	} else {
 	    /* user has switched to another IP addr */
Index: squid/src/stat.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/stat.c,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.3.12.1
diff -u -r1.1.1.3 -r1.1.1.3.12.1
--- squid/src/stat.c	26 Jan 2000 03:25:01 -0000	1.1.1.3
+++ squid/src/stat.c	15 Apr 2000 11:54:27 -0000	1.1.1.3.12.1
@@ -1,6 +1,6 @@
 
 /*
- * $Id: stat.c,v 1.1.1.3 2000/01/26 03:25:01 hno Exp $
+ * $Id: stat.c,v 1.1.1.3.12.1 2000/04/15 11:54:27 asd Exp $
  *
  * DEBUG: section 18    Cache Manager Statistics
  * AUTHOR: Harvest Derived
@@ -1332,8 +1332,6 @@
 		ntohs(conn->me.sin_port));
 	    storeAppendPrintf(s, "\tnrequests: %d\n",
 		conn->nrequests);
-	    storeAppendPrintf(s, "\tpersistent: %d\n",
-		conn->persistent);
 	    storeAppendPrintf(s, "\tdefer: n %d, until %d\n",
 		conn->defer.n, conn->defer.until);
 	}
Index: squid/src/structs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/structs.h,v
retrieving revision 1.1.1.3.4.1.2.2
retrieving revision 1.1.1.3.4.1.2.3
diff -u -r1.1.1.3.4.1.2.2 -r1.1.1.3.4.1.2.3
--- squid/src/structs.h	14 Apr 2000 23:09:53 -0000	1.1.1.3.4.1.2.2
+++ squid/src/structs.h	15 Apr 2000 11:54:27 -0000	1.1.1.3.4.1.2.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.1.1.3.4.1.2.2 2000/04/14 23:09:53 hno Exp $
+ * $Id: structs.h,v 1.1.1.3.4.1.2.3 2000/04/15 11:54:27 asd Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -906,10 +906,7 @@
     struct in_addr log_addr;
     char ident[USER_IDENT_SZ];
     int nrequests;
-    int persistent;
-#if USE_NTLM
     int authenticated;
-#endif
     struct {
 	int n;
 	time_t until;