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

- unbound-checkconf checks if modules exist and prints if they are

Browse source 
not compiled in the name of the wrong module.


git-svn-id: file:///svn/unbound/trunk@4842 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2018-08-09 08:33:56 +00:00
parent 611e37aa2d
commit d2f7999b4e
2 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/Changelog
View file

@ -1,3 +1,7 @@
9 August 2018: Wouter
- unbound-checkconf checks if modules exist and prints if they are
not compiled in the name of the wrong module.
7 August 2018: Ralph 7 August 2018: Ralph
- Make capsforid fallback QNAME minimisation aware. - Make capsforid fallback QNAME minimisation aware.

42
smallapp/unbound-checkconf.c
View file

@ -43,6 +43,7 @@
*/ */
#include "config.h" #include "config.h"
#include <ctype.h>
#include "util/log.h" #include "util/log.h"
#include "util/config_file.h" #include "util/config_file.h"
#include "util/module.h" #include "util/module.h"
@ -390,6 +391,43 @@ ecs_conf_checks(struct config_file* cfg)
} }
#endif /* CLIENT_SUBNET */ #endif /* CLIENT_SUBNET */
/** check that the modules exist, are compiled in */
static void
check_modules_exist(const char* module_conf)
{
const char** names = module_list_avail();
const char* s = module_conf;
while(*s) {
int i = 0;
int is_ok = 0;
while(*s && isspace((unsigned char)*s))
s++;
while(names[i]) {
if(strncmp(names[i], s, strlen(names[i])) == 0) {
is_ok = 1;
break;
}
i++;
}
if(is_ok == 0) {
char n[64];
size_t j;
n[0]=0;
n[sizeof(n)-1]=0;
for(j=0; j<sizeof(n); j++) {
if(!s[j] || isspace((unsigned char)s[j])) {
n[j] = 0;
break;
}
n[j] = s[j];
}
fatal_exit("module_conf lists module '%s' but that "
"module is not available.", n);
}
s += strlen(names[i]);
}
}
/** check configuration for errors */ /** check configuration for errors */
static void static void
morechecks(struct config_file* cfg, const char* fname) morechecks(struct config_file* cfg, const char* fname)
@ -483,6 +521,9 @@ morechecks(struct config_file* cfg, const char* fname)
free(cfg->chrootdir); free(cfg->chrootdir);
cfg->chrootdir = NULL; cfg->chrootdir = NULL;
/* 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 /* There should be no reason for 'respip' module not to work with
* dns64, but it's not explicitly confirmed, so the combination is * dns64, but it's not explicitly confirmed, so the combination is
* excluded below. It's simply unknown yet for the combination of * excluded below. It's simply unknown yet for the combination of
@ -529,7 +570,6 @@ morechecks(struct config_file* cfg, const char* fname)
#if defined(WITH_PYTHONMODULE) && defined(CLIENT_SUBNET) #if defined(WITH_PYTHONMODULE) && defined(CLIENT_SUBNET)
&& strcmp(cfg->module_conf, "python subnetcache iterator") != 0 && strcmp(cfg->module_conf, "python subnetcache iterator") != 0
&& strcmp(cfg->module_conf, "subnetcache python iterator") != 0 && strcmp(cfg->module_conf, "subnetcache python iterator") != 0
&& strcmp(cfg->module_conf, "subnetcache validator iterator") != 0
&& strcmp(cfg->module_conf, "python subnetcache validator iterator") != 0 && strcmp(cfg->module_conf, "python subnetcache validator iterator") != 0
&& strcmp(cfg->module_conf, "subnetcache python validator iterator") != 0 && strcmp(cfg->module_conf, "subnetcache python validator iterator") != 0
&& strcmp(cfg->module_conf, "subnetcache validator python iterator") != 0 && strcmp(cfg->module_conf, "subnetcache validator python iterator") != 0