- Review fixes for checkconf #259 change.

diff --git a/doc/Changelog b/doc/Changelog
index 93d69d94513cc8f6821755f1cd1b3c0281fed085..ff1f36bbeb08f27adfb47dfe068e17894992878b 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
          unbound-checkconf checks access-control-view, access-control-tags,
          access-control-tag-actions and access-control-tag-datas.
        - Fix offset of error printout for access-control-tag-datas.
+       - Review fixes for checkconf #259 change.
 
 6 July 2020: Wouter
        - run_vm cleanup better and removes trailing slash on single argument.

diff --git a/smallapp/unbound-checkconf.c b/smallapp/unbound-checkconf.c
index 409d29fea4de4c412da772c246810c4d08d8e993..0cf348adde2898a92aa8e07a2102bf36471fb547 100644 (file)
--- a/smallapp/unbound-checkconf.c
+++ b/smallapp/unbound-checkconf.c
@@ -197,7 +197,7 @@ localzonechecks(struct config_file* cfg)
 
 /** checks for acl and views */
 static void
-acl_view_checks(struct config_file* cfg, struct views* views)
+acl_view_tag_checks(struct config_file* cfg, struct views* views)
 {
        int d;
        struct sockaddr_storage a;
@@ -205,10 +205,10 @@ acl_view_checks(struct config_file* cfg, struct views* views)
        struct config_str2list* acl;
        struct config_str3list* s3;
        struct config_strbytelist* sb;
-       struct view* v;
 
        /* acl_view */
        for(acl=cfg->acl_view; acl; acl = acl->next) {
+               struct view* v;
                if(!netblockstrtoaddr(acl->str, UNBOUND_DNS_PORT, &a, &alen,
                        &d)) {
                        fatal_exit("cannot parse access-control-view "
@@ -300,7 +300,7 @@ view_and_respipchecks(struct config_file* cfg)
                fatal_exit("Could not setup respip set");
        if(!respip_views_apply_cfg(views, cfg, &ignored))
                fatal_exit("Could not setup per-view respip sets");
-       acl_view_checks(cfg, views);
+       acl_view_tag_checks(cfg, views);
        views_delete(views);
        respip_set_delete(respip);
 }