From: hno <>
Date: Mon, 18 Oct 2004 18:12:54 +0000 (+0000)
Subject: Bug #860: ACL based logging does not work
X-Git-Tag: SQUID_3_0_PRE4~1016
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd9be8c8c5a8917a6d2d54e32dcc567df31fa34b;p=thirdparty%2Fsquid.git

Bug #860: ACL based logging does not work
---

diff --git a/src/ACLChecklist.cc b/src/ACLChecklist.cc
index 26d2207847..08a69081f4 100644
--- a/src/ACLChecklist.cc
+++ b/src/ACLChecklist.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLChecklist.cc,v 1.17 2004/08/30 03:28:56 robertc Exp $
+ * $Id: ACLChecklist.cc,v 1.18 2004/10/18 12:12:54 hno Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -255,6 +255,7 @@ ACLChecklist::matchAclList(const acl_list * head, bool const fast)
             changeState(NullState::Instance());
 
         if (!nodeMatched || state_ != NullState::Instance()) {
+            finished_ = false;
             debug(28, 3) ("aclmatchAclList: %p returning false (AND list entry failed to match)\n", this);
             checkForAsync();
             PROF_stop(aclMatchAclList);
diff --git a/src/access_log.cc b/src/access_log.cc
index b48798db47..931153a1d6 100644
--- a/src/access_log.cc
+++ b/src/access_log.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: access_log.cc,v 1.96 2003/10/16 21:40:16 robertc Exp $
+ * $Id: access_log.cc,v 1.97 2004/10/18 12:12:54 hno Exp $
  *
  * DEBUG: section 46    Access Log
  * AUTHOR: Duane Wessels
@@ -1336,7 +1336,7 @@ accessLogLog(AccessLogEntry * al, ACLChecklist * checklist)
         xstrncpy(al->hier.host, dash_str, SQUIDHOSTNAMELEN);
 
     for (log = Config.Log.accesslogs; log; log = log->next) {
-        if (checklist && log->aclList && checklist->matchAclListFast(log->aclList))
+        if(checklist && log->aclList && !checklist->matchAclListFast(log->aclList))
             continue;
 
         switch (log->type) {