Bug #1873: authenticateNTLMFixErrorHeader: state 4.

Squid crashes with the above message if denying access after successful
NTLM or Negotiate authentication. Problem introduced in 2.6.STABLE6.

diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc
index eecf4019d57708760ea16760f48d55e135cac14e..2a80ff18a2259ee8dd89214705462d1b71589453 100644 (file)
--- a/src/auth/negotiate/auth_negotiate.cc
+++ b/src/auth/negotiate/auth_negotiate.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_negotiate.cc,v 1.12 2007/01/03 12:39:48 hno Exp $
+ * $Id: auth_negotiate.cc,v 1.13 2007/01/20 21:13:59 hno Exp $
  *
  * DEBUG: section 29    Negotiate Authenticator
  * AUTHOR: Robert Collins, Henrik Nordstrom, Francesco Chemolli
@@ -317,6 +317,7 @@ AuthNegotiateConfig::fixHeader(auth_user_request_t *auth_user_request, HttpReply
             /* 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.
              */

diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc
index 06a0e4015439068b6e69bad7d60a66189cc5a814..43188a2a49cdfeaf01fd3c4e41f53326ba6233f5 100644 (file)
--- a/src/auth/ntlm/auth_ntlm.cc
+++ b/src/auth/ntlm/auth_ntlm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_ntlm.cc,v 1.61 2007/01/03 12:39:49 hno Exp $
+ * $Id: auth_ntlm.cc,v 1.62 2007/01/20 21:13:59 hno Exp $
  *
  * DEBUG: section 29    NTLM Authenticator
  * AUTHOR: Robert Collins, Henrik Nordstrom, Francesco Chemolli
@@ -293,6 +293,7 @@ AuthNTLMConfig::fixHeader(auth_user_request_t *auth_user_request, HttpReply *rep
             /* 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.
              */