- Sync unbound and unbound-checkconf log output for unknown modules.

diff --git a/doc/Changelog b/doc/Changelog
index e96a9eba7d2955e823da8cc76772d455d11ae338..e97eed9bf3dd01057da872918869d53fcc8e0f4b 100644 (file)
--- 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 fa68cc71d2ff28b1e30d47aa45ecadcd31b795eb..2bc79c4adfd77456ea62d42e6025b7ca9b1c963e 100644 (file)
--- 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 3b7ba758afa5fb836991d8a38a1440b6aab16caf..9dd73fa8f7e3c5d2fdb468f483104aa734f3b789 100644 (file)
--- 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]);
        }