From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 22 Apr 2019 02:00:28 +0000 (-0400)
Subject: don't really need to pass the config section to modules_instantiate anymore
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d45c8aef0198ea83c88e68fa74f98d3991e850c;p=thirdparty%2Ffreeradius-server.git

don't really need to pass the config section to modules_instantiate anymore
---

diff --git a/src/bin/radiusd.c b/src/bin/radiusd.c
index 6818a8101e4..c1300ce2978 100644
--- a/src/bin/radiusd.c
+++ b/src/bin/radiusd.c
@@ -668,7 +668,7 @@ int main(int argc, char *argv[])
 	 *	Call the module's initialisation methods.  These create
 	 *	connection pools and open connections to external resources.
 	 */
-	if (modules_instantiate(config->root_cs) < 0) EXIT_WITH_FAILURE;
+	if (modules_instantiate() < 0) EXIT_WITH_FAILURE;
 
 	/*
 	 *	Instantiate "permanent" xlats
diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c
index e6e7c670533..7cb3c5787a2 100644
--- a/src/bin/unit_test_module.c
+++ b/src/bin/unit_test_module.c
@@ -868,7 +868,7 @@ int main(int argc, char *argv[])
 	/*
 	 *	Instantiate the modules
 	 */
-	if (modules_instantiate(config->root_cs) < 0) EXIT_WITH_FAILURE;
+	if (modules_instantiate() < 0) EXIT_WITH_FAILURE;
 
 	/*
 	 *	Create a dummy event list
diff --git a/src/lib/server/module.c b/src/lib/server/module.c
index ecc8a542d78..9368be2762a 100644
--- a/src/lib/server/module.c
+++ b/src/lib/server/module.c
@@ -971,26 +971,14 @@ static int _module_instantiate(void *instance, UNUSED void *ctx)
  * Allows the module to initialise connection pools, and complete any registrations that depend on
  * attributes created during the bootstrap phase.
  *
- * @param[in] root	Configuration root.
  * @return
  *	- 0 on success.
  *	- -1 on failure.
  */
-int modules_instantiate(CONF_SECTION *root)
+int modules_instantiate(void)
 {
-	CONF_SECTION *modules;
-
-	modules = cf_section_find(root, "modules", NULL);
-	if (!modules) return 0;
-
 	DEBUG2("#### Instantiating modules ####");
 
-	if (fr_command_register_hook(NULL, NULL, modules, cmd_table) < 0) {
-		ERROR("Failed registering radmin commands for modules - %s",
-		      fr_strerror());
-		return -1;
-	}
-
 	if (rbtree_walk(module_instance_name_tree, RBTREE_IN_ORDER, _module_instantiate, NULL) < 0) return -1;
 
 #ifndef NDEBUG
@@ -1429,5 +1417,11 @@ int modules_bootstrap(CONF_SECTION *root)
 
 	cf_log_debug(modules, " } # modules");
 
+	if (fr_command_register_hook(NULL, NULL, modules, cmd_table) < 0) {
+		ERROR("Failed registering radmin commands for modules - %s",
+		      fr_strerror());
+		return -1;
+	}
+
 	return 0;
 }
diff --git a/src/lib/server/module.h b/src/lib/server/module.h
index 153e208b8c1..920cf41985b 100644
--- a/src/lib/server/module.h
+++ b/src/lib/server/module.h
@@ -281,7 +281,7 @@ void		modules_free(void);
 
 int		modules_thread_instantiate(TALLOC_CTX *ctx, fr_event_list_t *el) CC_HINT(nonnull);
 
-int		modules_instantiate(CONF_SECTION *root) CC_HINT(nonnull);
+int		modules_instantiate(void) CC_HINT(nonnull);
 
 module_instance_t *module_bootstrap(module_instance_t const *parent, CONF_SECTION *cs) CC_HINT(nonnull(2));