---------------------
PatchSet 3994 
Date: 2007/01/21 07:34:49
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Merge from HEAD

Members: 
	lib/rfc2617.c:1.4->1.4.8.1 
	src/cf.data.pre:1.68.2.7->1.68.2.8 
	src/auth/negotiate/auth_negotiate.cc:1.10.2.2->1.10.2.3 
	src/auth/ntlm/auth_ntlm.cc:1.19.4.1->1.19.4.2 

Index: squid3/lib/rfc2617.c
===================================================================
RCS file: /cvsroot/squid-sf//squid3/lib/rfc2617.c,v
retrieving revision 1.4
retrieving revision 1.4.8.1
diff -u -r1.4 -r1.4.8.1
--- squid3/lib/rfc2617.c	8 Nov 2003 03:12:55 -0000	1.4
+++ squid3/lib/rfc2617.c	21 Jan 2007 07:34:49 -0000	1.4.8.1
@@ -13,7 +13,7 @@
 
 
 /*
- * $Id: rfc2617.c,v 1.4 2003/11/08 03:12:55 squidadm Exp $
+ * $Id: rfc2617.c,v 1.4.8.1 2007/01/21 07:34:49 amosjeffries Exp $
  *
  * DEBUG:
  * AUTHOR: RFC 2617 & Robert Collins
@@ -83,14 +83,20 @@
 	j = Hex[i];
 	if (('0' <= j) && (j <= '9'))
 	    n = j - '0';
-	else
+	else if (('a' <= j) && (j <= 'f'))
 	    n = j - 'a' + 10;
+	else if (('A' <= j) && (j <= 'F'))
+	    n = j - 'A' + 10;
+	else
+	    continue;
 	if (i % 2 == 0)
 	    Bin[i / 2] = n << 4;
 	else
 	    Bin[i / 2] |= n;
     }
-    Bin[HASHLEN] = '\0';
+    for (; i <= HASHHEXLEN; i++) {
+	Bin[i] = '\0';
+    }
 }
 
 
Index: squid3/src/cf.data.pre
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/cf.data.pre,v
retrieving revision 1.68.2.7
retrieving revision 1.68.2.8
diff -u -r1.68.2.7 -r1.68.2.8
--- squid3/src/cf.data.pre	5 Jan 2007 16:59:09 -0000	1.68.2.7
+++ squid3/src/cf.data.pre	21 Jan 2007 07:34:50 -0000	1.68.2.8
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.68.2.7 2007/01/05 16:59:09 hno Exp $
+# $Id: cf.data.pre,v 1.68.2.8 2007/01/21 07:34:50 amosjeffries Exp $
 #
 #
 # SQUID Web Proxy Cache		http://www.squid-cache.org/
@@ -1813,7 +1813,7 @@
 	"program" cmdline
 	Specify the command for the external authenticator.  Such
 	a program reads a line containing "username":"realm" and
-	replies with the appropriate H(A1) value base64 encoded or
+	replies with the appropriate H(A1) value hex encoded or
 	ERR if the user (or his H(A1) hash) does not exists.
 	See rfc 2616 for the definition of H(A1).
 	"ERR" responses may optionally be followed by a error description
Index: squid3/src/auth/negotiate/auth_negotiate.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/auth/negotiate/auth_negotiate.cc,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -r1.10.2.2 -r1.10.2.3
--- squid3/src/auth/negotiate/auth_negotiate.cc	5 Jan 2007 17:00:34 -0000	1.10.2.2
+++ squid3/src/auth/negotiate/auth_negotiate.cc	21 Jan 2007 07:34:50 -0000	1.10.2.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_negotiate.cc,v 1.10.2.2 2007/01/05 17:00:34 hno Exp $
+ * $Id: auth_negotiate.cc,v 1.10.2.3 2007/01/21 07:34:50 amosjeffries Exp $
  *
  * DEBUG: section 29    Negotiate Authenticator
  * AUTHOR: Robert Collins, Henrik Nordstrom, Francesco Chemolli
@@ -317,6 +317,7 @@
             /* fall through */
 
         case AUTHENTICATE_STATE_FINISHED:
+        case AUTHENTICATE_STATE_DONE:
             /* Special case: authentication finished OK but disallowed by ACL.
              * Need to start over to give the client another chance.
              */
Index: squid3/src/auth/ntlm/auth_ntlm.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/auth/ntlm/auth_ntlm.cc,v
retrieving revision 1.19.4.1
retrieving revision 1.19.4.2
diff -u -r1.19.4.1 -r1.19.4.2
--- squid3/src/auth/ntlm/auth_ntlm.cc	5 Jan 2007 17:00:36 -0000	1.19.4.1
+++ squid3/src/auth/ntlm/auth_ntlm.cc	21 Jan 2007 07:34:50 -0000	1.19.4.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_ntlm.cc,v 1.19.4.1 2007/01/05 17:00:36 hno Exp $
+ * $Id: auth_ntlm.cc,v 1.19.4.2 2007/01/21 07:34:50 amosjeffries Exp $
  *
  * DEBUG: section 29    NTLM Authenticator
  * AUTHOR: Robert Collins, Henrik Nordstrom, Francesco Chemolli
@@ -293,6 +293,7 @@
             /* fall through */
 
         case AUTHENTICATE_STATE_FINISHED:
+        case AUTHENTICATE_STATE_DONE:
             /* Special case: authentication finished OK but disallowed by ACL.
              * Need to start over to give the client another chance.
              */