a better fix for the last commit

FreeRADIUS · Apr 26, 2018 · 6d9f5ab · 6d9f5ab
1 parent 2c6dc23
commit 6d9f5ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/lib/io/master.c b/src/lib/io/master.c
@@ -2154,11 +2154,6 @@ static int mod_bootstrap(void *instance, CONF_SECTION *cs)
 	 */
 	inst->magic = PR_MAIN_MAGIC;
 
-	/*
-	 *	Bootstrap the protocol agnostic IO handler.
-	 */
-	inst->server_cs = cf_item_to_section(cf_parent(cs));
-
 	/*
 	 *	Find and bootstrap the application IO handler.
 	 */

diff --git a/src/modules/proto_radius/proto_radius.c b/src/modules/proto_radius/proto_radius.c
@@ -470,10 +470,7 @@ static void mod_process_set(void const *instance, REQUEST *request)
 	rad_assert(request->packet->code != 0);
 	rad_assert(request->packet->code <= FR_CODE_MAX);
 
-	/*
-	 *	It's already set for the unit tests.
-	 */
-	if (!request->server_cs) request->server_cs = inst->io.server_cs;
+	request->server_cs = inst->io.server_cs;
 
 	/*
 	 *	'track' can be NULL when there's no network listener.
@@ -866,6 +863,11 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf)
 		i++;
 	}
 
+	/*
+	 *	Ensure that the server CONF_SECTION is always set.
+	 */
+	inst->io.server_cs = cf_item_to_section(cf_parent(conf));
+
 	/*
 	 *	No IO module, it's an empty listener.
 	 */