- Add respip to supported module-config options in unbound-checkconf.

diff --git a/doc/Changelog b/doc/Changelog
index 9f14eafa5ce074872824fe5085d1776269ecd829..322eceea890c51011f11a80432766589dca5bdd5 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+17 February 2020: Ralph
+       - Add respip to supported module-config options in unbound-checkconf.
+
 17 February 2020: George
        - Remove unused variable.
 

diff --git a/smallapp/unbound-checkconf.c b/smallapp/unbound-checkconf.c
index 27c6d4c3a3f90a3a8b91ef9334e73e55e9b29ef1..1d31fd84e3aecc2f8456205eca366cfa12dc0670 100644 (file)
--- a/smallapp/unbound-checkconf.c
+++ b/smallapp/unbound-checkconf.c
@@ -548,10 +548,7 @@ morechecks(struct config_file* cfg)
        /* check that the modules listed in module_conf exist */
        check_modules_exist(cfg->module_conf);
 
-       /* There should be no reason for 'respip' module not to work with
-        * dns64, but it's not explicitly confirmed,  so the combination is
-        * excluded below.   It's simply unknown yet for the combination of
-        * respip and other modules. */
+       /* Respip is know to *not* work with dns64. */
        if(strcmp(cfg->module_conf, "iterator") != 0
                && strcmp(cfg->module_conf, "validator iterator") != 0
                && strcmp(cfg->module_conf, "dns64 validator iterator") != 0
@@ -560,7 +557,9 @@ morechecks(struct config_file* cfg)
                && strcmp(cfg->module_conf, "respip validator iterator") != 0
 #ifdef WITH_PYTHONMODULE
                && strcmp(cfg->module_conf, "python iterator") != 0
+               && strcmp(cfg->module_conf, "python respip iterator") != 0
                && strcmp(cfg->module_conf, "python validator iterator") != 0
+               && strcmp(cfg->module_conf, "python respip validator iterator") != 0
                && strcmp(cfg->module_conf, "validator python iterator") != 0
                && strcmp(cfg->module_conf, "dns64 python iterator") != 0
                && strcmp(cfg->module_conf, "dns64 python validator iterator") != 0
@@ -570,7 +569,9 @@ morechecks(struct config_file* cfg)
 #endif
 #ifdef USE_CACHEDB
                && strcmp(cfg->module_conf, "validator cachedb iterator") != 0
+               && strcmp(cfg->module_conf, "respip validator cachedb iterator") != 0
                && strcmp(cfg->module_conf, "cachedb iterator") != 0
+               && strcmp(cfg->module_conf, "respip cachedb iterator") != 0
                && strcmp(cfg->module_conf, "dns64 validator cachedb iterator") != 0
                && strcmp(cfg->module_conf, "dns64 cachedb iterator") != 0
 #endif
@@ -580,39 +581,61 @@ morechecks(struct config_file* cfg)
                && strcmp(cfg->module_conf, "dns64 python cachedb iterator") != 0
                && strcmp(cfg->module_conf, "dns64 python validator cachedb iterator") != 0
                && strcmp(cfg->module_conf, "python cachedb iterator") != 0
+               && strcmp(cfg->module_conf, "python respip cachedb iterator") != 0
                && strcmp(cfg->module_conf, "python validator cachedb iterator") != 0
+               && strcmp(cfg->module_conf, "python respip validator cachedb iterator") != 0
                && strcmp(cfg->module_conf, "cachedb python iterator") != 0
+               && strcmp(cfg->module_conf, "respip cachedb python iterator") != 0
                && strcmp(cfg->module_conf, "validator cachedb python iterator") != 0
+               && strcmp(cfg->module_conf, "respip validator cachedb python iterator") != 0
                && strcmp(cfg->module_conf, "validator python cachedb iterator") != 0
+               && strcmp(cfg->module_conf, "respip validator python cachedb iterator") != 0
 #endif
 #ifdef CLIENT_SUBNET
                && strcmp(cfg->module_conf, "subnetcache iterator") != 0
+               && strcmp(cfg->module_conf, "respip subnetcache iterator") != 0
                && strcmp(cfg->module_conf, "subnetcache validator iterator") != 0
+               && strcmp(cfg->module_conf, "respip subnetcache validator iterator") != 0
                && strcmp(cfg->module_conf, "dns64 subnetcache iterator") != 0
                && strcmp(cfg->module_conf, "dns64 subnetcache validator iterator") != 0
 #endif
 #if defined(WITH_PYTHONMODULE) && defined(CLIENT_SUBNET)
                && strcmp(cfg->module_conf, "python subnetcache iterator") != 0
+               && strcmp(cfg->module_conf, "python respip subnetcache iterator") != 0
                && strcmp(cfg->module_conf, "subnetcache python iterator") != 0
+               && strcmp(cfg->module_conf, "respip subnetcache python iterator") != 0
                && strcmp(cfg->module_conf, "python subnetcache validator iterator") != 0
+               && strcmp(cfg->module_conf, "python respip subnetcache validator iterator") != 0
                && strcmp(cfg->module_conf, "subnetcache python validator iterator") != 0
+               && strcmp(cfg->module_conf, "respip subnetcache python validator iterator") != 0
                && strcmp(cfg->module_conf, "subnetcache validator python iterator") != 0
+               && strcmp(cfg->module_conf, "respip subnetcache validator python iterator") != 0
 #endif
 #ifdef USE_IPSECMOD
                && strcmp(cfg->module_conf, "ipsecmod iterator") != 0
+               && strcmp(cfg->module_conf, "ipsecmod respip iterator") != 0
                && strcmp(cfg->module_conf, "ipsecmod validator iterator") != 0
+               && strcmp(cfg->module_conf, "ipsecmod respip validator iterator") != 0
 #endif
 #if defined(WITH_PYTHONMODULE) && defined(USE_IPSECMOD)
                && strcmp(cfg->module_conf, "python ipsecmod iterator") != 0
+               && strcmp(cfg->module_conf, "python ipsecmod respip iterator") != 0
                && strcmp(cfg->module_conf, "ipsecmod python iterator") != 0
+               && strcmp(cfg->module_conf, "ipsecmod python respip iterator") != 0
                && strcmp(cfg->module_conf, "ipsecmod validator iterator") != 0
+               && strcmp(cfg->module_conf, "ipsecmod respip validator iterator") != 0
                && strcmp(cfg->module_conf, "python ipsecmod validator iterator") != 0
+               && strcmp(cfg->module_conf, "python ipsecmod respip validator iterator") != 0
                && strcmp(cfg->module_conf, "ipsecmod python validator iterator") != 0
+               && strcmp(cfg->module_conf, "ipsecmod python respip validator iterator") != 0
                && strcmp(cfg->module_conf, "ipsecmod validator python iterator") != 0
+               && strcmp(cfg->module_conf, "ipsecmod respip validator python iterator") != 0
 #endif
 #ifdef USE_IPSET
                && strcmp(cfg->module_conf, "validator ipset iterator") != 0
+               && strcmp(cfg->module_conf, "validator ipset respip iterator") != 0
                && strcmp(cfg->module_conf, "ipset iterator") != 0
+               && strcmp(cfg->module_conf, "ipset respip iterator") != 0
 #endif
                ) {
                fatal_exit("module conf '%s' is not known to work",