From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 20 May 2024 21:46:28 +0000 (-0400)
Subject: Remove MONO functions for the majority of modules
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4146893df440ea5fa1672c2843fc05562f7d1db6;p=thirdparty%2Ffreeradius-server.git

Remove MONO functions for the majority of modules
---

diff --git a/src/lib/unlang/xlat_builtin.c b/src/lib/unlang/xlat_builtin.c
index 2bd688163c4..5c0f46d5477 100644
--- a/src/lib/unlang/xlat_builtin.c
+++ b/src/lib/unlang/xlat_builtin.c
@@ -4022,7 +4022,6 @@ do { \
 	xlat_func_flags_set(xlat, XLAT_FUNC_FLAG_PURE | XLAT_FUNC_FLAG_INTERNAL); \
 } while (0)
 
-
 	XLAT_REGISTER_MONO("bin", xlat_func_bin, FR_TYPE_OCTETS, xlat_func_bin_arg);
 	XLAT_REGISTER_MONO("hex", xlat_func_hex, FR_TYPE_STRING, xlat_func_hex_arg);
 	XLAT_REGISTER_MONO("map", xlat_func_map, FR_TYPE_INT8, xlat_func_map_arg);
diff --git a/src/modules/rlm_cipher/rlm_cipher.c b/src/modules/rlm_cipher/rlm_cipher.c
index 50506689110..b02fbc4cdbc 100644
--- a/src/modules/rlm_cipher/rlm_cipher.c
+++ b/src/modules/rlm_cipher/rlm_cipher.c
@@ -1300,7 +1300,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 			 *	Register decrypt xlat
 			 */
 			xlat = xlat_func_register_module(mctx->mi->boot, mctx, "decrypt", cipher_rsa_decrypt_xlat, FR_TYPE_STRING);
-			xlat_func_mono_set(xlat, cipher_rsa_decrypt_xlat_arg);
+			xlat_func_args_set(xlat, cipher_rsa_decrypt_xlat_arg);
 
 			/*
 			 *	Verify sign xlat
@@ -1332,13 +1332,13 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 			 *	Register encrypt xlat
 			 */
 			xlat = xlat_func_register_module(mctx->mi->boot, mctx, "encrypt", cipher_rsa_encrypt_xlat, FR_TYPE_OCTETS);
-			xlat_func_mono_set(xlat, cipher_rsa_encrypt_xlat_arg);
+			xlat_func_args_set(xlat, cipher_rsa_encrypt_xlat_arg);
 
 			/*
 			 *	Register sign xlat
 			 */
 			xlat = xlat_func_register_module(mctx->mi->boot, mctx, "sign", cipher_rsa_sign_xlat, FR_TYPE_OCTETS);
-			xlat_func_mono_set(xlat, cipher_rsa_sign_xlat_arg);
+			xlat_func_args_set(xlat, cipher_rsa_sign_xlat_arg);
 
 			/*
 			 *	FIXME: These should probably be split into separate xlats
diff --git a/src/modules/rlm_escape/rlm_escape.c b/src/modules/rlm_escape/rlm_escape.c
index 394db3d997a..29c2732723c 100644
--- a/src/modules/rlm_escape/rlm_escape.c
+++ b/src/modules/rlm_escape/rlm_escape.c
@@ -196,11 +196,11 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	xlat_t		*xlat;
 
 	xlat = xlat_func_register_module(mctx->mi->boot, mctx, "escape", escape_xlat, FR_TYPE_STRING);
-	xlat_func_mono_set(xlat, escape_xlat_arg);
+	xlat_func_args_set(xlat, escape_xlat_arg);
 	xlat_func_flags_set(xlat, XLAT_FUNC_FLAG_PURE);
 
 	xlat = xlat_func_register_module(mctx->mi->boot, mctx, "unescape", unescape_xlat, FR_TYPE_STRING);
-	xlat_func_mono_set(xlat, unescape_xlat_arg);
+	xlat_func_args_set(xlat, unescape_xlat_arg);
 	xlat_func_flags_set(xlat, XLAT_FUNC_FLAG_PURE);
 
 	return 0;
diff --git a/src/modules/rlm_idn/rlm_idn.c b/src/modules/rlm_idn/rlm_idn.c
index 2250f7bd4d0..7f79f52d0e1 100644
--- a/src/modules/rlm_idn/rlm_idn.c
+++ b/src/modules/rlm_idn/rlm_idn.c
@@ -153,7 +153,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	xlat_t		*xlat;
 
 	xlat = xlat_func_register_module(mctx->mi->boot, mctx, NULL, xlat_idna, FR_TYPE_STRING);
-	xlat_func_mono_set(xlat, xlat_idna_arg);
+	xlat_func_args_set(xlat, xlat_idna_arg);
 	xlat_func_flags_set(xlat, XLAT_FUNC_FLAG_PURE);
 
 	return 0;
diff --git a/src/modules/rlm_json/rlm_json.c b/src/modules/rlm_json/rlm_json.c
index b39464505bb..9508b2fc8e3 100644
--- a/src/modules/rlm_json/rlm_json.c
+++ b/src/modules/rlm_json/rlm_json.c
@@ -577,7 +577,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	xlat_t			*xlat;
 
 	xlat = xlat_func_register_module(mctx->mi->boot, mctx, "encode", json_encode_xlat, FR_TYPE_STRING);
-	xlat_func_mono_set(xlat, json_encode_xlat_arg);
+	xlat_func_args_set(xlat, json_encode_xlat_arg);
 
 	if (map_proc_register(mctx->mi->boot, inst, "json", mod_map_proc,
 			      mod_map_proc_instantiate, sizeof(rlm_json_jpath_cache_t), 0) < 0) return -1;
@@ -595,7 +595,7 @@ static int mod_load(void)
 	if (unlikely(!(xlat = xlat_func_register(NULL, "json.quote", json_quote_xlat, FR_TYPE_STRING)))) return -1;
 	xlat_func_args_set(xlat, json_escape_xlat_arg);
 	if (unlikely(!(xlat = xlat_func_register(NULL, "json.jpath_validate", json_jpath_validate_xlat, FR_TYPE_STRING)))) return -1;
-	xlat_func_mono_set(xlat, json_jpath_validate_xlat_arg);
+	xlat_func_args_set(xlat, json_jpath_validate_xlat_arg);
 
 	return 0;
 }
diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index bbc651bfd03..49e631f1bc9 100644
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -2664,7 +2664,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	}
 
 	xlat = xlat_func_register_module(mctx->mi->boot, mctx, NULL, ldap_xlat, FR_TYPE_STRING);
-	xlat_func_mono_set(xlat, ldap_xlat_arg);
+	xlat_func_args_set(xlat, ldap_xlat_arg);
 
 	if (unlikely(!(xlat = xlat_func_register_module(mctx->mi->boot, mctx, "memberof", ldap_memberof_xlat,
 							FR_TYPE_BOOL)))) return -1;
@@ -2686,7 +2686,7 @@ static int mod_load(void)
 	xlat_t	*xlat;
 
 	if (unlikely(!(xlat = xlat_func_register(NULL, "ldap.uri.escape", ldap_uri_escape_xlat, FR_TYPE_STRING)))) return -1;
-	xlat_func_mono_set(xlat, ldap_uri_escape_xlat_arg);
+	xlat_func_args_set(xlat, ldap_uri_escape_xlat_arg);
 	xlat_func_flags_set(xlat, XLAT_FUNC_FLAG_PURE);
 	xlat_func_safe_for_set(xlat, LDAP_URI_SAFE_FOR);	/* Used for all LDAP escaping */
 
@@ -2696,7 +2696,7 @@ static int mod_load(void)
 	xlat_func_safe_for_set(xlat, LDAP_URI_SAFE_FOR);
 
 	if (unlikely(!(xlat = xlat_func_register(NULL, "ldap.uri.unescape", ldap_uri_unescape_xlat, FR_TYPE_STRING)))) return -1;
-	xlat_func_mono_set(xlat, ldap_uri_unescape_xlat_arg);
+	xlat_func_args_set(xlat, ldap_uri_unescape_xlat_arg);
 	xlat_func_flags_set(xlat, XLAT_FUNC_FLAG_PURE);
 
 	return 0;
diff --git a/src/modules/rlm_linelog/rlm_linelog.c b/src/modules/rlm_linelog/rlm_linelog.c
index dd7b179f75b..cb1a017c601 100644
--- a/src/modules/rlm_linelog/rlm_linelog.c
+++ b/src/modules/rlm_linelog/rlm_linelog.c
@@ -1041,7 +1041,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	};
 
 	xlat = xlat_func_register_module(mctx->mi->boot, mctx, NULL, linelog_xlat, FR_TYPE_SIZE);
-	xlat_func_mono_set(xlat, linelog_xlat_args);
+	xlat_func_args_set(xlat, linelog_xlat_args);
 	xlat_func_call_env_set(xlat, &linelog_xlat_method_env );
 
 	return 0;
diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 0ea3b998dff..a565718900d 100644
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -1941,7 +1941,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 		};
 		sql_xlat_arg[1] = (xlat_arg_parser_t)XLAT_ARG_PARSER_TERMINATOR;
 
-		xlat_func_mono_set(xlat, sql_xlat_arg);
+		xlat_func_args_set(xlat, sql_xlat_arg);
 	}
 
 	/*
@@ -1971,7 +1971,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	};
 	sql_xlat_arg[1] = (xlat_arg_parser_t)XLAT_ARG_PARSER_TERMINATOR;
 
-	xlat_func_mono_set(xlat, sql_xlat_arg);
+	xlat_func_args_set(xlat, sql_xlat_arg);
 
 	/*
 	 *	Register the SQL map processor function
diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c
index c0fdd744eaf..c31a6eec9a6 100644
--- a/src/modules/rlm_unix/rlm_unix.c
+++ b/src/modules/rlm_unix/rlm_unix.c
@@ -208,7 +208,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	};
 	xlat_arg[1] = (xlat_arg_parser_t)XLAT_ARG_PARSER_TERMINATOR;
 
-	xlat_func_mono_set(xlat, xlat_arg);
+	xlat_func_args_set(xlat, xlat_arg);
 
 	return 0;
 }
diff --git a/src/modules/rlm_winbind/rlm_winbind.c b/src/modules/rlm_winbind/rlm_winbind.c
index 5d5978a0413..8c7d9de02ba 100644
--- a/src/modules/rlm_winbind/rlm_winbind.c
+++ b/src/modules/rlm_winbind/rlm_winbind.c
@@ -551,7 +551,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 		return -1;
 	}
 
-	xlat_func_mono_set(xlat, winbind_group_xlat_arg);
+	xlat_func_args_set(xlat, winbind_group_xlat_arg);
 	xlat_func_call_env_set(xlat, &winbind_group_xlat_call_env);
 
 	return 0;
diff --git a/src/modules/rlm_yubikey/rlm_yubikey.c b/src/modules/rlm_yubikey/rlm_yubikey.c
index c9f48cbe465..75cd09a56bc 100644
--- a/src/modules/rlm_yubikey/rlm_yubikey.c
+++ b/src/modules/rlm_yubikey/rlm_yubikey.c
@@ -179,7 +179,7 @@ static int mod_load(void)
 	}
 
 	if (unlikely(!(xlat = xlat_func_register(NULL, "modhextohex", modhex_to_hex_xlat, FR_TYPE_STRING)))) return -1;
-	xlat_func_mono_set(xlat, modhex_to_hex_xlat_arg);
+	xlat_func_args_set(xlat, modhex_to_hex_xlat_arg);
 	xlat_func_flags_set(xlat, XLAT_FUNC_FLAG_PURE);
 
 	return 0;