From: hno <>
Date: Wed, 3 Jan 2007 19:39:48 +0000 (+0000)
Subject: Bug #1792: max_user_ip not working with ntlm_auth
X-Git-Tag: SQUID_3_0_PRE6~161
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9acda3ae81204e9bc8c56edbfcb045562b32f45;p=thirdparty%2Fsquid.git

Bug #1792: max_user_ip not working with ntlm_auth

the ntlm/negotiate scheme reqrite was a bit confused about the FINISHED
vs DONE states, skipping a little of the processing required for the
user and ip caches.
---

diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc
index 0ca74aebea..eecf4019d5 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.11 2006/09/03 04:12:01 hno Exp $
+ * $Id: auth_negotiate.cc,v 1.12 2007/01/03 12:39:48 hno Exp $
  *
  * DEBUG: section 29    Negotiate Authenticator
  * AUTHOR: Robert Collins, Henrik Nordstrom, Francesco Chemolli
@@ -617,7 +617,7 @@ AuthNegotiateConfig::decode(char const *proxy_auth)
 int
 AuthNegotiateUserRequest::authenticated() const
 {
-    if (auth_state == AUTHENTICATE_STATE_FINISHED) {
+    if (auth_state == AUTHENTICATE_STATE_DONE) {
         debug(29, 9) ("AuthNegotiateUserRequest::authenticated: user authenticated.\n");
         return 1;
     }
diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc
index 5ff7d549c1..06a0e40154 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.60 2006/09/03 04:12:02 hno Exp $
+ * $Id: auth_ntlm.cc,v 1.61 2007/01/03 12:39:49 hno Exp $
  *
  * DEBUG: section 29    NTLM Authenticator
  * AUTHOR: Robert Collins, Henrik Nordstrom, Francesco Chemolli
@@ -548,7 +548,7 @@ AuthNTLMConfig::decode(char const *proxy_auth)
 int
 AuthNTLMUserRequest::authenticated() const
 {
-    if (auth_state == AUTHENTICATE_STATE_FINISHED) {
+    if (auth_state == AUTHENTICATE_STATE_DONE) {
         debug(29, 9) ("AuthNTLMUserRequest::authenticated: user authenticated.\n");
         return 1;
     }