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 2bd688163c4c6f5d93e7907e8a29dcea71b665dc..5c0f46d547730dade5eb38e37820fe4b64185b43 100644 (file)
--- 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 50506689110ccc7f9972432508e369705edd2be6..b02fbc4cdbc5e0d41b6199e64a1addcc75a0f29a 100644 (file)
--- 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 394db3d997a4189092fbe86d7de22e3475258752..29c2732723c6470f8ef173a633918f410875875e 100644 (file)
--- 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 2250f7bd4d096a31b28f05d5659b76ac7cade0c8..7f79f52d0e1657e0269b02aafca0525b05bd57fb 100644 (file)
--- 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 b39464505bbb303787adce763dbf233ee40b1ae9..9508b2fc8e32dbe62213f1c390f24cb70b5fea7a 100644 (file)
--- 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 bbc651bfd035280e3d1bb544cc39ea3560a48708..49e631f1bc96e32291ca04c1b58bc0a841c4a973 100644 (file)
--- 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 dd7b179f75bd6f6a1b255a741256760f43d9d68e..cb1a017c601fa0cca3ce79a81f2609acd97344ee 100644 (file)
--- 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 0ea3b998dff8f725f19db05236c9ff6d91bf03eb..a565718900d6e451fd64eefb6954504287596f3f 100644 (file)
--- 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 c0fdd744eafc9cacde959a35a0e191f51ecf97c8..c31a6eec9a6d16bad191bb940a586da992606fba 100644 (file)
--- 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 5d5978a0413f4818a8138afb0babfc38b6647c78..8c7d9de02bafb9d86cb77b7cbe5b88bf794cabb0 100644 (file)
--- 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 c9f48cbe465a6aa6d854973f7110cf1e235bd34a..75cd09a56bc8185ebea80c40bda4c8b8606daae6 100644 (file)
--- 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;