From: W.C.A. Wijngaards Date: Tue, 7 Jul 2020 08:18:56 +0000 (+0200) Subject: - Review fixes for checkconf #259 change. X-Git-Tag: release-1.11.0~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d84529cc0ec73564a761c732e709702c72a44d32;p=thirdparty%2Funbound.git - Review fixes for checkconf #259 change. --- diff --git a/doc/Changelog b/doc/Changelog index 93d69d945..ff1f36bbe 100644 --- 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 409d29fea..0cf348add 100644 --- 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); }