upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Stop unbound-checkconf from insisting that auth-zone and rpz

Browse source 
zonefiles have to exist.  They can not exist, and download later.
This commit is contained in:
W.C.A. Wijngaards 2020-02-14 07:57:57 +01:00
parent 77bdbc6e98
commit 2665ae0414
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/Changelog
View file

@ -1,5 +1,7 @@
14 February 2020: Wouter 14 February 2020: Wouter
- Fix spelling in unbound.conf.5.in. - Fix spelling in unbound.conf.5.in.
- Stop unbound-checkconf from insisting that auth-zone and rpz
zonefiles have to exist. They can not exist, and download later.
13 February 2020: Wouter 13 February 2020: Wouter
- tag for 1.10.0rc1 release. - tag for 1.10.0rc1 release.

7
smallapp/unbound-checkconf.c
View file

@ -469,7 +469,6 @@ check_modules_exist(const char* module_conf)
static void static void
morechecks(struct config_file* cfg) morechecks(struct config_file* cfg)
{ {
struct config_auth* auth;
warn_hosts("stub-host", cfg->stubs); warn_hosts("stub-host", cfg->stubs);
warn_hosts("forward-host", cfg->forwards); warn_hosts("forward-host", cfg->forwards);
interfacechecks(cfg); interfacechecks(cfg);
@ -535,12 +534,6 @@ morechecks(struct config_file* cfg)
cfg->trusted_keys_file_list, cfg->chrootdir, cfg); cfg->trusted_keys_file_list, cfg->chrootdir, cfg);
check_chroot_string("dlv-anchor-file", &cfg->dlv_anchor_file, check_chroot_string("dlv-anchor-file", &cfg->dlv_anchor_file,
cfg->chrootdir, cfg); cfg->chrootdir, cfg);
for(auth = cfg->auths; auth; auth = auth->next) {
char* az = (auth->isrpz) ? "rpz zonefile" :
"auth-zone zonefile";
check_chroot_string(az, &auth->zonefile,
cfg->chrootdir, cfg);
}
#ifdef USE_IPSECMOD #ifdef USE_IPSECMOD
if(cfg->ipsecmod_enabled && strstr(cfg->module_conf, "ipsecmod")) { if(cfg->ipsecmod_enabled && strstr(cfg->module_conf, "ipsecmod")) {
/* only check hook if enabled */ /* only check hook if enabled */