From: Evan Hunt <each@isc.org>
Date: Mon, 23 Oct 2017 18:11:19 +0000 (-0700)
Subject: [master] clean up a redundancy
X-Git-Tag: v9.12.0b2~89
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89636d8f305956ad42e95a988502c7345e85ffe1;p=thirdparty%2Fbind9.git

[master] clean up a redundancy

4777.	[cleanup]	Removed a redundant call to configure_view_acl().
			[RT #46369]
---

diff --git a/CHANGES b/CHANGES
index 72cb7f4a830..dac0ca6cc8e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4777.	[cleanup]	Removed a redundant call to configure_view_acl().
+			[RT #46369]
+
 4776.	[bug]		Improve portability of ht_test. [RT #46333]
 
 4775.	[bug]		Address Coverity warnings in ht_test.c and mem_test.c
diff --git a/bin/named/server.c b/bin/named/server.c
index 2101c1ded26..969c6e494db 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -4681,20 +4681,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, named_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