From: Nick Porter <nick@portercomputing.co.uk>
Date: Wed, 25 May 2022 16:45:45 +0000 (+0100)
Subject: Remove module bootstrapping from conf parsing (#4538)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ce76981166f681054b3cf90b53942fe30c65c2c;p=thirdparty%2Ffreeradius-server.git

Remove module bootstrapping from conf parsing (#4538)
---

diff --git a/src/lib/server/virtual_servers.c b/src/lib/server/virtual_servers.c
index bf3e7bf6cdb..d748bd83e59 100644
--- a/src/lib/server/virtual_servers.c
+++ b/src/lib/server/virtual_servers.c
@@ -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);