From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 2 Sep 2024 12:57:46 +0000 (-0400)
Subject: hoist "set flag" to before we read the config files
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc325c242a89ffad1945cbb15d9b0e742e96407d;p=thirdparty%2Ffreeradius-server.git

hoist "set flag" to before we read the config files
---

diff --git a/src/lib/server/main_config.c b/src/lib/server/main_config.c
index 0808c4fc1f..22ca4dc8dd 100644
--- a/src/lib/server/main_config.c
+++ b/src/lib/server/main_config.c
@@ -1077,6 +1077,11 @@ int main_config_init(main_config_t *config)
 	 */
 	config->talloc_pool_size = 8 * 1024; /* default */
 
+	/*
+	 *	Migration flags
+	 */
+	if (!tmpl_require_enum_prefix) tmpl_require_enum_prefix = config->require_enum_prefix;
+
 	cs = cf_section_alloc(NULL, NULL, "main", NULL);
 	if (!cs) return -1;
 
@@ -1420,11 +1425,6 @@ do {\
 
 	config->root_cs = cs;	/* Do this last to avoid dangling pointers on error */
 
-	/*
-	 *	Migration flags
-	 */
-	tmpl_require_enum_prefix = config->require_enum_prefix;
-
 	/* Clear any unprocessed configuration errors */
 	fr_strerror_clear();