From: W.C.A. Wijngaards Date: Mon, 18 May 2020 08:16:40 +0000 (+0200) Subject: - For PR #93: checkconf allow multiple dynlib in module-config, for X-Git-Tag: 1.11.0rc1~41 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84e95d6c6825191ea920485f53d3611d2c279e82;p=thirdparty%2Funbound.git - For PR #93: checkconf allow multiple dynlib in module-config, for a couple cases. --- diff --git a/doc/Changelog b/doc/Changelog index 637b31368..f16e6d63d 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -3,6 +3,8 @@ with dlclose and dlopen of the library again. Also for multiple modules. Fix memory leak by not closing dlopened content. Fix to allow one dynlibmod instance by unbound-checkconf. + - For PR #93: checkconf allow multiple dynlib in module-config, for + a couple cases. 15 May 2020: Wouter - Merge PR #93: Add dynamic library support. diff --git a/smallapp/unbound-checkconf.c b/smallapp/unbound-checkconf.c index 77c558981..97cacc012 100644 --- a/smallapp/unbound-checkconf.c +++ b/smallapp/unbound-checkconf.c @@ -571,8 +571,12 @@ morechecks(struct config_file* cfg) #endif #ifdef WITH_DYNLIBMODULE && strcmp(cfg->module_conf, "dynlib iterator") != 0 + && strcmp(cfg->module_conf, "dynlib dynlib iterator") != 0 + && strcmp(cfg->module_conf, "dynlib dynlib dynlib iterator") != 0 && strcmp(cfg->module_conf, "dynlib respip iterator") != 0 && strcmp(cfg->module_conf, "dynlib validator iterator") != 0 + && strcmp(cfg->module_conf, "dynlib dynlib validator iterator") != 0 + && strcmp(cfg->module_conf, "dynlib dynlib dynlib validator iterator") != 0 && strcmp(cfg->module_conf, "dynlib respip validator iterator") != 0 && strcmp(cfg->module_conf, "validator dynlib iterator") != 0 && strcmp(cfg->module_conf, "dns64 dynlib iterator") != 0