From 33ab321a9782c210bbca81f60e4110d7fd29bb5c Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Mon, 23 Oct 2017 11:13:11 -0700 Subject: [PATCH] [v9_10] clean up a redundancy 4777. [cleanup] Removed a redundant call to configure_view_acl(). [RT #46369] (cherry picked from commit 89636d8f305956ad42e95a988502c7345e85ffe1) (cherry picked from commit a06198688faca5c7bc1a35ec0ec18bc68c07691c) --- CHANGES | 3 +++ bin/named/server.c | 19 +++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CHANGES b/CHANGES index edf5948c90..3904c7d32c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +4777. [cleanup] Removed a redundant call to configure_view_acl(). + [RT #46369] + 4774. [bug] was incorrectly included in several header files. [RT #46311] diff --git a/bin/named/server.c b/bin/named/server.c index 2bbccb6073..3d79ac775c 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -3446,20 +3446,19 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * "allow-recursion" inherits from "allow-query-cache" if set, * otherwise from "allow-query" if set. */ - if (view->cacheacl == NULL && view->recursionacl != NULL) + if (view->cacheacl == NULL && view->recursionacl != NULL) { dns_acl_attach(view->recursionacl, &view->cacheacl); - /* - * XXXEACH: This call to configure_view_acl() is redundant. We - * are leaving it as it is because we are making a minimal change - * for a patch release. In the future this should be changed to - * dns_acl_attach(view->queryacl, &view->cacheacl). - */ - if (view->cacheacl == NULL && view->recursion) - CHECK(configure_view_acl(vconfig, config, "allow-query", NULL, - actx, ns_g_mctx, &view->cacheacl)); + } + + if (view->cacheacl == NULL && view->recursion) { + dns_acl_attach(view->queryacl, &view->cacheacl); + } + if (view->recursion && view->recursionacl == NULL && view->cacheacl != NULL) + { dns_acl_attach(view->cacheacl, &view->recursionacl); + } /* * Set default "allow-recursion", "allow-recursion-on" and