From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 28 Jun 2023 13:20:02 +0000 (-0400)
Subject: simplify dynamic client config a bit
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1bc62bc7e8f04559498ce00d020f9367905dcb6;p=thirdparty%2Ffreeradius-server.git

simplify dynamic client config a bit
---

diff --git a/src/lib/server/process.h b/src/lib/server/process.h
index 5128e8690a7..b4b81604f61 100644
--- a/src/lib/server/process.h
+++ b/src/lib/server/process.h
@@ -445,6 +445,27 @@ static inline unlang_action_t new_client(rlm_rcode_t *p_result, module_ctx_t con
 					      cs, RLM_MODULE_FAIL, resume_new_client,
 					      NULL, 0, mctx->rctx);
 }
+
+#define DYNAMIC_CLIENT_SECTIONS \
+	{ \
+		.name = "new", \
+		.name2 = "client", \
+		.component = MOD_AUTHORIZE, \
+		.offset = PROCESS_CONF_OFFSET(new_client), \
+	}, \
+	{ \
+		.name = "add", \
+		.name2 = "client", \
+		.component = MOD_AUTHORIZE, \
+		.offset = PROCESS_CONF_OFFSET(add_client), \
+	}, \
+	{ \
+		.name = "deny", \
+		.name2 = "client", \
+		.component = MOD_AUTHORIZE, \
+		.offset = PROCESS_CONF_OFFSET(deny_client), \
+	}
+
 #endif	/* PROCESS_DYNAMIC_CLIENT */
 
 #endif	/* defined(PROCESS_INST) && defined(PROCESS_PACKET_TYPE) && defined(PROCESS_PACKET_CODE_VALID) */
diff --git a/src/process/radius/base.c b/src/process/radius/base.c
index b90ddb9a8d1..c35d8653cbf 100644
--- a/src/process/radius/base.c
+++ b/src/process/radius/base.c
@@ -1281,24 +1281,8 @@ static virtual_server_compile_t const compile_list[] = {
 		.component = MOD_AUTHENTICATE
 	},
 
-	{
-		.name = "new",
-		.name2 = "client",
-		.component = MOD_AUTHORIZE,
-		.offset = PROCESS_CONF_OFFSET(new_client),
-	},
-	{
-		.name = "add",
-		.name2 = "client",
-		.component = MOD_AUTHORIZE,
-		.offset = PROCESS_CONF_OFFSET(add_client),
-	},
-	{
-		.name = "deny",
-		.name2 = "client",
-		.component = MOD_AUTHORIZE,
-		.offset = PROCESS_CONF_OFFSET(deny_client),
-	},
+	DYNAMIC_CLIENT_SECTIONS,
+
 	COMPILE_TERMINATOR
 };