From: wessels <>
Date: Thu, 2 Apr 1998 14:40:31 +0000 (+0000)
Subject: Make 'cache_host_domain' AND'ed with 'cache_host_acl'
X-Git-Tag: SQUID_3_0_PRE1~3646
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=130faaed884088db5a8016d6f2df773197cd3ded;p=thirdparty%2Fsquid.git

Make 'cache_host_domain' AND'ed with 'cache_host_acl'
---

diff --git a/src/neighbors.cc b/src/neighbors.cc
index 7324ddfe09..20de57e7f7 100644
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: neighbors.cc,v 1.187 1998/03/31 05:37:47 wessels Exp $
+ * $Id: neighbors.cc,v 1.188 1998/04/02 07:40:31 wessels Exp $
  *
  * DEBUG: section 15    Neighbor Routines
  * AUTHOR: Harvest Derived
@@ -203,15 +203,21 @@ peerAllowedToUse(const peer * p, request_t * request)
 	return do_ping;
     do_ping = 0;
     for (d = p->pinglist; d; d = d->next) {
-	if (matchDomainName(d->domain, request->host))
-	    return d->do_ping;
+	if (matchDomainName(d->domain, request->host)) {
+	    do_ping = d->do_ping;
+	    break;
+	}
 	do_ping = !d->do_ping;
     }
+    if (0 == do_ping)
+	return do_ping;
     checklist.src_addr = request->client_addr;
     checklist.request = request;
     for (a = p->acls; a; a = a->next) {
-	if (aclMatchAcl(a->acl, &checklist))
-	    return a->op;
+	if (aclMatchAcl(a->acl, &checklist)) {
+	    do_ping = a->op;
+	    break;
+	}
 	do_ping = !a->op;
     }
     return do_ping;