From: hno <>
Date: Sun, 21 Jan 2007 04:13:59 +0000 (+0000)
Subject: Bug #1873: authenticateNTLMFixErrorHeader: state 4.
X-Git-Tag: SQUID_3_0_PRE6~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ebd65a337a3448437614d2217dce951eba91d8d4;p=thirdparty%2Fsquid.git

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 eecf4019d5..2a80ff18a2 100644
--- 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 06a0e40154..43188a2a49 100644
--- 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.
              */