From 5dd14e26443a3801eea1e04cd650822183fe4762 Mon Sep 17 00:00:00 2001 From: Yorgos Thessalonikefs Date: Mon, 5 May 2025 14:47:12 +0200 Subject: [PATCH] - Sync unbound and unbound-checkconf log output for unknown modules. --- doc/Changelog | 3 +++ services/modstack.c | 4 ++-- smallapp/unbound-checkconf.c | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index e96a9eba7..e97eed9bf 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +5 May 2025: Yorgos + - Sync unbound and unbound-checkconf log output for unknown modules. + 29 April 2025: Wouter - Fix for parallel build of dnstap protoc-c output. - Fix dnstap to use protoc. diff --git a/services/modstack.c b/services/modstack.c index fa68cc71d..2bc79c4ad 100644 --- a/services/modstack.c +++ b/services/modstack.c @@ -138,8 +138,8 @@ modstack_config(struct module_stack* stack, const char* module_conf) if(strchr(s, ' ')) *(strchr(s, ' ')) = 0; if(strchr(s, '\t')) *(strchr(s, '\t')) = 0; log_err("Unknown value in module-config, module: '%s'." - " This module is not present (not compiled in)," - " See the list of linked modules with unbound -V", s); + " This module is not present (not compiled in);" + " see the list of linked modules with unbound -V", s); return 0; } } diff --git a/smallapp/unbound-checkconf.c b/smallapp/unbound-checkconf.c index 3b7ba758a..9dd73fa8f 100644 --- a/smallapp/unbound-checkconf.c +++ b/smallapp/unbound-checkconf.c @@ -636,8 +636,10 @@ check_modules_exist(const char* module_conf) } n[j] = s[j]; } - fatal_exit("module_conf lists module '%s' but that " - "module is not available.", n); + fatal_exit("Unknown value in module-config, module: " + "'%s'. This module is not present (not " + "compiled in); see the list of linked modules " + "with unbound -V", n); } s += strlen(names[i]); } -- 2.47.2