mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

check both allow-query-cache and allow-query-cache-on

Browse Source
This commit is contained in:
Evan Hunt
2018-07-26 11:33:39 -07:00
parent 5752645e60
commit 2b61b83199
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ns/query.c
View File

@@ -1029,7 +1029,9 @@ query_checkcacheaccess(ns_client_t *client, const dns_name_t *name,
if ((client->query.attributes & NS_QUERYATTR_CACHEACLOKVALID) == 0) {
/*
* The view's cache ACL has not yet been evaluated. Do it now.
* The view's cache ACLs have not yet been evaluated.
* Do it now. Both allow-query-cache and
* allow-query-cache-on must be satsified.
*/
bool log = ((options & DNS_GETDB_NOLOG) == 0);
char msg[NS_CLIENT_ACLMSGSIZE("query (cache)")];
@@ -1037,6 +1039,12 @@ query_checkcacheaccess(ns_client_t *client, const dns_name_t *name,
result = ns_client_checkaclsilent(client, NULL,
client->view->cacheacl,
true);
if (result == ISC_R_SUCCESS) {
result = ns_client_checkaclsilent(client,
&client->destaddr,
client->view->cacheonacl,
true);
};
if (result == ISC_R_SUCCESS) {
/*
* We were allowed by the "allow-query-cache" ACL.