From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 10 May 2024 15:43:55 +0000 (-0600)
Subject: Remove manual bootstrapping, it's not needed
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c608cc8cc82c4aae5bb2e59220149cdb146c879;p=thirdparty%2Ffreeradius-server.git

Remove manual bootstrapping, it's not needed
---

diff --git a/src/lib/io/master.c b/src/lib/io/master.c
index 8f69b0d8e14..ecc40f7a1ad 100644
--- a/src/lib/io/master.c
+++ b/src/lib/io/master.c
@@ -2638,11 +2638,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	fr_io_instance_t *inst = mctx->mi->data;
 	CONF_SECTION *conf = mctx->mi->conf;
 
-	/*
-	 *	Find and bootstrap the application IO handler.
-	 */
 	inst->app_io = (fr_app_io_t const *) inst->submodule->exported;
-
 	inst->app_io_conf = inst->submodule->conf;
 	inst->app_io_instance = inst->submodule->data;
 
@@ -2664,11 +2660,6 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 		}
 	}
 
-	if (inst->app_io->common.bootstrap && (inst->app_io->common.bootstrap(MODULE_INST_CTX(inst->submodule)) < 0)) {
-		cf_log_err(inst->app_io_conf, "Bootstrap failed for proto_%s", inst->app_io->common.name);
-		return -1;
-	}
-
 	/*
 	 *	Get various information after bootstrapping the
 	 *	application IO module.
diff --git a/src/listen/detail/proto_detail.c b/src/listen/detail/proto_detail.c
index 41bc7c25ba9..c5ed83013a8 100644
--- a/src/listen/detail/proto_detail.c
+++ b/src/listen/detail/proto_detail.c
@@ -536,11 +536,6 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	inst->app_io_instance = inst->io_submodule->data;
 	inst->app_io_conf = inst->io_submodule->conf;
 
-	if (inst->app_io->common.bootstrap && (inst->app_io->common.bootstrap(MODULE_INST_CTX(inst->io_submodule)) < 0)) {
-		cf_log_err(inst->app_io_conf, "Bootstrap failed for \"%s\"", inst->app_io->common.name);
-		return -1;
-	}
-
 	/*
 	 *	If we're not loading the work submodule directly, then try to load it here.
 	 */
diff --git a/src/listen/ldap_sync/proto_ldap_sync.c b/src/listen/ldap_sync/proto_ldap_sync.c
index 20b11427ad8..a8007699898 100644
--- a/src/listen/ldap_sync/proto_ldap_sync.c
+++ b/src/listen/ldap_sync/proto_ldap_sync.c
@@ -386,12 +386,6 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	inst->app_io_instance = inst->io_submodule->data;
 	inst->app_io_conf = inst->io_submodule->conf;
 
-	if (inst->app_io->common.bootstrap &&
-	    (inst->app_io->common.bootstrap(MODULE_INST_CTX(inst->io_submodule)) < 0)) {
-		cf_log_err(inst->app_io_conf, "Bootstrap failed for \"%s\"", inst->app_io->common.name);
-		return -1;
-	}
-
 	return 0;
 }