From: W.C.A. Wijngaards Date: Fri, 14 Feb 2020 06:57:57 +0000 (+0100) Subject: - Stop unbound-checkconf from insisting that auth-zone and rpz X-Git-Tag: release-1.10.0rc2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2665ae0414341dd6f2aed5d90588d55bd2a87be8;p=thirdparty%2Funbound.git - Stop unbound-checkconf from insisting that auth-zone and rpz zonefiles have to exist. They can not exist, and download later. --- diff --git a/doc/Changelog b/doc/Changelog index 1e1c7c11b..6bbb4dba5 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,5 +1,7 @@ 14 February 2020: Wouter - 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 - tag for 1.10.0rc1 release. diff --git a/smallapp/unbound-checkconf.c b/smallapp/unbound-checkconf.c index 07b8f4522..27c6d4c3a 100644 --- a/smallapp/unbound-checkconf.c +++ b/smallapp/unbound-checkconf.c @@ -469,7 +469,6 @@ check_modules_exist(const char* module_conf) static void morechecks(struct config_file* cfg) { - struct config_auth* auth; warn_hosts("stub-host", cfg->stubs); warn_hosts("forward-host", cfg->forwards); interfacechecks(cfg); @@ -535,12 +534,6 @@ morechecks(struct config_file* cfg) cfg->trusted_keys_file_list, cfg->chrootdir, cfg); check_chroot_string("dlv-anchor-file", &cfg->dlv_anchor_file, 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 if(cfg->ipsecmod_enabled && strstr(cfg->module_conf, "ipsecmod")) { /* only check hook if enabled */