- Review fixes for checkconf #259 change.

This commit is contained in:
W.C.A. Wijngaards 2020-07-07 10:18:56 +02:00
parent 4d009e19fc
commit d84529cc0e
2 changed files with 4 additions and 3 deletions

View file

@ -3,6 +3,7 @@
unbound-checkconf checks access-control-view, access-control-tags, unbound-checkconf checks access-control-view, access-control-tags,
access-control-tag-actions and access-control-tag-datas. access-control-tag-actions and access-control-tag-datas.
- Fix offset of error printout for access-control-tag-datas. - Fix offset of error printout for access-control-tag-datas.
- Review fixes for checkconf #259 change.
6 July 2020: Wouter 6 July 2020: Wouter
- run_vm cleanup better and removes trailing slash on single argument. - run_vm cleanup better and removes trailing slash on single argument.

View file

@ -197,7 +197,7 @@ localzonechecks(struct config_file* cfg)
/** checks for acl and views */ /** checks for acl and views */
static void 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; int d;
struct sockaddr_storage a; struct sockaddr_storage a;
@ -205,10 +205,10 @@ acl_view_checks(struct config_file* cfg, struct views* views)
struct config_str2list* acl; struct config_str2list* acl;
struct config_str3list* s3; struct config_str3list* s3;
struct config_strbytelist* sb; struct config_strbytelist* sb;
struct view* v;
/* acl_view */ /* acl_view */
for(acl=cfg->acl_view; acl; acl = acl->next) { for(acl=cfg->acl_view; acl; acl = acl->next) {
struct view* v;
if(!netblockstrtoaddr(acl->str, UNBOUND_DNS_PORT, &a, &alen, if(!netblockstrtoaddr(acl->str, UNBOUND_DNS_PORT, &a, &alen,
&d)) { &d)) {
fatal_exit("cannot parse access-control-view " 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"); fatal_exit("Could not setup respip set");
if(!respip_views_apply_cfg(views, cfg, &ignored)) if(!respip_views_apply_cfg(views, cfg, &ignored))
fatal_exit("Could not setup per-view respip sets"); fatal_exit("Could not setup per-view respip sets");
acl_view_checks(cfg, views); acl_view_tag_checks(cfg, views);
views_delete(views); views_delete(views);
respip_set_delete(respip); respip_set_delete(respip);
} }