config: improve handling of unknown modules

The change fixes module print when specified module is unknown. On
example config:

    server:
      module-config: "respip valdator iterator"

Before the change printed error looked like:

    error: Unknown value in module-config, module: ''. This module is
    not present (not compiled in), See the list of linked modules with
    unbound -V

After the change module is printed as expected:

    error: Unknown value in module-config, module: 'valdator'. This
    module is not present (not compiled in), See the list of linked
    modules with unbound -V

Module truncation happens because parse error does not guarantee that
leading whitespace is removed by `module_factory()` call.

The change always removes leading whitespace (if present).

diff --git a/services/modstack.c b/services/modstack.c
index da8e623c16dae8edbaccfdf125cc32973f44d76b..a90d7178c4103bea38fbefc9d8914000cf61d98a 100644 (file)
--- a/services/modstack.c
+++ b/services/modstack.c
@@ -120,12 +120,16 @@ modstack_config(struct module_stack* stack, const char* module_conf)
                stack->mod[i] = module_factory(&module_conf);
                if(!stack->mod[i]) {
                        char md[256];
+                       char * s = md;
                        snprintf(md, sizeof(md), "%s", module_conf);
-                       if(strchr(md, ' ')) *(strchr(md, ' ')) = 0;
-                       if(strchr(md, '\t')) *(strchr(md, '\t')) = 0;
+                       /* Leading spaces are present on errors. */
+                       while (*s && isspace((unsigned char)*s))
+                               s++;
+                       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", md);
+                               " See the list of linked modules with unbound -V", s);
                        return 0;
                }
        }