Commit 89636d8f authored by Evan Hunt's avatar Evan Hunt
Browse files

[master] clean up a redundancy

4777.	[cleanup]	Removed a redundant call to configure_view_acl().
			[RT #46369]
parent 34ee1cdb
4777. [cleanup] Removed a redundant call to configure_view_acl().
[RT #46369]
4776. [bug] Improve portability of ht_test. [RT #46333] 4776. [bug] Improve portability of ht_test. [RT #46333]
   
4775. [bug] Address Coverity warnings in ht_test.c and mem_test.c 4775. [bug] Address Coverity warnings in ht_test.c and mem_test.c
......
...@@ -4681,20 +4681,19 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, ...@@ -4681,20 +4681,19 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
* "allow-recursion" inherits from "allow-query-cache" if set, * "allow-recursion" inherits from "allow-query-cache" if set,
* otherwise from "allow-query" 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); 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 if (view->cacheacl == NULL && view->recursion) {
* for a patch release. In the future this should be changed to dns_acl_attach(view->queryacl, &view->cacheacl);
* 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->recursion && if (view->recursion &&
view->recursionacl == NULL && view->cacheacl != NULL) view->recursionacl == NULL && view->cacheacl != NULL)
{
dns_acl_attach(view->cacheacl, &view->recursionacl); dns_acl_attach(view->cacheacl, &view->recursionacl);
}
/* /*
* Set default "allow-recursion", "allow-recursion-on" and * Set default "allow-recursion", "allow-recursion-on" and
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment