]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Remove module bootstrapping from conf parsing (#4538)
authorNick Porter <nick@portercomputing.co.uk>
Wed, 25 May 2022 16:45:45 +0000 (17:45 +0100)
committerGitHub <noreply@github.com>
Wed, 25 May 2022 16:45:45 +0000 (12:45 -0400)
src/lib/server/virtual_servers.c

index bf3e7bf6cdb19aef8f66d2144edd450595cfde94..d748bd83e5934604acf489b699f8974d373c3014 100644 (file)
@@ -311,20 +311,12 @@ static int namespace_parse(UNUSED TALLOC_CTX *ctx, void *out, UNUSED void *paren
        }
 
        if (module_conf_parse(mi, process_cs) < 0) {
-       error:
                cf_log_perr(ci, "Failed bootstrapping process module");
                cf_data_remove(server_cs, mi, "process_module");
                TALLOC_FREE(server->process_mi);
                return -1;
        }
 
-       /*
-        *      Pass server_cs, even though it's wrong.  We don't have
-        *      anything else to pass, and the dl_module() function
-        *      only uses the CONF_SECTION for printing.
-        */
-       if (module_bootstrap(server->process_mi) < 0) goto error;
-
        /*
         *      Pull the list of sections we need to compile out of
         *      the process module's public struct.
@@ -442,21 +434,10 @@ static int listen_parse(UNUSED TALLOC_CTX *ctx, void *out, UNUSED void *parent,
 
        if (module_conf_parse(mi, listener_cs) < 0) {
                cf_log_perr(ci, "Failed parsing config for listener");
-       error:
                talloc_free(mi);
                return -1;
        }
 
-       /*
-        *      Pass server_cs, even though it's wrong.  We don't have
-        *      anything else to pass, and the dl_module() function
-        *      only uses the CONF_SECTION for printing.
-        */
-       if (module_bootstrap(mi) < 0) {
-               cf_log_perr(ci, "Failed bootstrapping listener");
-               goto error;
-       }
-
        listener->proto_mi = mi;
        listener->proto_module = (fr_app_t const *)listener->proto_mi->dl_inst->module->common;
        cf_data_add(listener_cs, mi, "proto_module", false);