- 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 1e1c7c11b141dd57b5e01f9f9ad6bdbb9da680d2..6bbb4dba56d98b26d1fafd5d03e20c1eea5fa624 100644 (file)
--- 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 07b8f4522905c10241d70fee9cd3d9fcb029443b..27c6d4c3a3f90a3a8b91ef9334e73e55e9b29ef1 100644 (file)
--- 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 */