Make 'cache_host_domain' AND'ed with 'cache_host_acl'

diff --git a/src/neighbors.cc b/src/neighbors.cc
index 7324ddfe09286ca6bedf496071c30ffdbdfc0bfe..20de57e7f751d8d9c1913024e9965cf3aa803c41 100644 (file)
--- 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;