From: Arran Cudbard-Bell Date: Thu, 30 Jun 2022 20:46:33 +0000 (-0500) Subject: s/module_method_names_t/module_method_name_t/ X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b0bef2f8fe8197bb4a3a80d3ceb1c08bbb9951d;p=thirdparty%2Ffreeradius-server.git s/module_method_names_t/module_method_name_t/ --- diff --git a/src/lib/server/module.h b/src/lib/server/module.h index faff657d853..abbf4ee8fbb 100644 --- a/src/lib/server/module.h +++ b/src/lib/server/module.h @@ -38,7 +38,7 @@ extern "C" { #include typedef struct module_s module_t; -typedef struct module_method_names_s module_method_names_t; +typedef struct module_method_name_s module_method_name_t; typedef struct module_instance_s module_instance_t; typedef struct module_thread_instance_s module_thread_instance_t; typedef struct module_list_t module_list_t; @@ -119,7 +119,7 @@ extern "C" { /** Named methods exported by a module * */ -struct module_method_names_s { +struct module_method_name_s { char const *name1; //!< i.e. "recv", "send", "process" char const *name2; //!< The packet type i.e Access-Request, Access-Reject. diff --git a/src/lib/server/module_rlm.c b/src/lib/server/module_rlm.c index 7e0685c078e..e178eeadb38 100644 --- a/src/lib/server/module_rlm.c +++ b/src/lib/server/module_rlm.c @@ -436,7 +436,7 @@ module_instance_t *module_rlm_by_name_and_method(module_method_t *method, UNUSED size_t len; int j; module_instance_t *mi; - module_method_names_t const *methods; + module_method_name_t const *methods; char const *method_name1, *method_name2; module_rlm_t const *mrlm; diff --git a/src/lib/server/module_rlm.h b/src/lib/server/module_rlm.h index 6b3641139b8..aaeabf30919 100644 --- a/src/lib/server/module_rlm.h +++ b/src/lib/server/module_rlm.h @@ -35,7 +35,7 @@ extern char const *section_type_value[MOD_COUNT]; typedef struct { module_t common; //!< Common fields presented by all modules. - module_method_names_t const *method_names; //!< named methods + module_method_name_t const *method_names; //!< named methods fr_dict_t const **dict; //!< pointer to local fr_dict_t* } module_rlm_t; diff --git a/src/modules/rlm_always/rlm_always.c b/src/modules/rlm_always/rlm_always.c index fdcdcd8e725..1423fa9da35 100644 --- a/src/modules/rlm_always/rlm_always.c +++ b/src/modules/rlm_always/rlm_always.c @@ -168,7 +168,7 @@ module_rlm_t rlm_always = { .bootstrap = mod_bootstrap, .instantiate = mod_instantiate, }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = CF_IDENT_ANY, .name2 = CF_IDENT_ANY, .method = mod_always_return }, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c index bf12e4f2872..83b338fc9a3 100644 --- a/src/modules/rlm_attr_filter/rlm_attr_filter.c +++ b/src/modules/rlm_attr_filter/rlm_attr_filter.c @@ -376,7 +376,7 @@ module_rlm_t rlm_attr_filter = { .config = module_config, .instantiate = mod_instantiate, }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ /* * Hack to support old configurations */ diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c index 9792a4db7b6..fc8fa68478d 100644 --- a/src/modules/rlm_cache/rlm_cache.c +++ b/src/modules/rlm_cache/rlm_cache.c @@ -1380,7 +1380,7 @@ module_rlm_t rlm_cache = { .instantiate = mod_instantiate, .detach = mod_detach }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "status", .name2 = CF_IDENT_ANY, .method = mod_method_status }, { .name1 = "load", .name2 = CF_IDENT_ANY, .method = mod_method_load }, { .name1 = "store", .name2 = CF_IDENT_ANY, .method = mod_method_store }, diff --git a/src/modules/rlm_chap/rlm_chap.c b/src/modules/rlm_chap/rlm_chap.c index 4e08c49b33b..efbed76db4e 100644 --- a/src/modules/rlm_chap/rlm_chap.c +++ b/src/modules/rlm_chap/rlm_chap.c @@ -324,7 +324,7 @@ module_rlm_t rlm_chap = { .instantiate = mod_instantiate }, .dict = &dict_radius, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "recv", .name2 = "access-request", .method = mod_authorize }, { .name1 = "authenticate", .name2 = CF_IDENT_ANY, .method = mod_authenticate }, MODULE_NAME_TERMINATOR diff --git a/src/modules/rlm_client/rlm_client.c b/src/modules/rlm_client/rlm_client.c index ced01386567..ad0362bb386 100644 --- a/src/modules/rlm_client/rlm_client.c +++ b/src/modules/rlm_client/rlm_client.c @@ -384,7 +384,7 @@ module_rlm_t rlm_client = { .onload = mod_load, .unload = mod_unload }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = CF_IDENT_ANY, .name2 = CF_IDENT_ANY, .method = mod_authorize }, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_couchbase/rlm_couchbase.c b/src/modules/rlm_couchbase/rlm_couchbase.c index 93cdd62bd95..15012925d42 100644 --- a/src/modules/rlm_couchbase/rlm_couchbase.c +++ b/src/modules/rlm_couchbase/rlm_couchbase.c @@ -556,7 +556,7 @@ module_rlm_t rlm_couchbase = { .instantiate = mod_instantiate, .detach = mod_detach }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "recv", .name2 = CF_IDENT_ANY, .method = mod_authorize }, { .name1 = "accounting", .name2 = CF_IDENT_ANY, .method = mod_accounting }, MODULE_NAME_TERMINATOR diff --git a/src/modules/rlm_csv/rlm_csv.c b/src/modules/rlm_csv/rlm_csv.c index 0b0d820ea4d..0c8f8c33b32 100644 --- a/src/modules/rlm_csv/rlm_csv.c +++ b/src/modules/rlm_csv/rlm_csv.c @@ -1060,7 +1060,7 @@ module_rlm_t rlm_csv = { .bootstrap = mod_bootstrap, .instantiate = mod_instantiate, }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = CF_IDENT_ANY, .name2 = CF_IDENT_ANY, .method = mod_process }, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_delay/rlm_delay.c b/src/modules/rlm_delay/rlm_delay.c index 53d8501396e..a914acc189d 100644 --- a/src/modules/rlm_delay/rlm_delay.c +++ b/src/modules/rlm_delay/rlm_delay.c @@ -280,7 +280,7 @@ module_rlm_t rlm_delay = { .config = module_config, .bootstrap = mod_bootstrap }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = CF_IDENT_ANY, .name2 = CF_IDENT_ANY, .method = mod_delay }, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_detail/rlm_detail.c b/src/modules/rlm_detail/rlm_detail.c index 0c77049dae7..233e1e18a4d 100644 --- a/src/modules/rlm_detail/rlm_detail.c +++ b/src/modules/rlm_detail/rlm_detail.c @@ -465,7 +465,7 @@ module_rlm_t rlm_detail = { .config = module_config, .instantiate = mod_instantiate }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "recv", .name2 = "accounting-request", .method = mod_accounting }, { .name1 = "recv", .name2 = CF_IDENT_ANY, .method = mod_authorize }, { .name1 = "accounting", .name2 = CF_IDENT_ANY, .method = mod_accounting }, diff --git a/src/modules/rlm_dhcpv4/rlm_dhcpv4.c b/src/modules/rlm_dhcpv4/rlm_dhcpv4.c index 5a1ab6d777f..ca6eb4f147b 100644 --- a/src/modules/rlm_dhcpv4/rlm_dhcpv4.c +++ b/src/modules/rlm_dhcpv4/rlm_dhcpv4.c @@ -328,7 +328,7 @@ module_rlm_t rlm_dhcpv4 = { .thread_inst_type = "rlm_dhcpv4_thread_t", .thread_instantiate = mod_thread_instantiate }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = CF_IDENT_ANY, .name2 = CF_IDENT_ANY, .method = mod_process }, MODULE_NAME_TERMINATOR }, diff --git a/src/modules/rlm_digest/rlm_digest.c b/src/modules/rlm_digest/rlm_digest.c index 5007ed9910e..2438f10b304 100644 --- a/src/modules/rlm_digest/rlm_digest.c +++ b/src/modules/rlm_digest/rlm_digest.c @@ -481,7 +481,7 @@ module_rlm_t rlm_digest = { .instantiate = mod_instantiate, }, .dict = &dict_radius, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "recv", .name2 = "access-request", .method = mod_authorize }, { .name1 = "authenticate", .name2 = CF_IDENT_ANY, .method = mod_authenticate }, MODULE_NAME_TERMINATOR diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c index 04c206af7a8..d7abc663c3a 100644 --- a/src/modules/rlm_eap/rlm_eap.c +++ b/src/modules/rlm_eap/rlm_eap.c @@ -1198,7 +1198,7 @@ module_rlm_t rlm_eap = { .bootstrap = mod_bootstrap, .instantiate = mod_instantiate, }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "recv", .name2 = "access-request", .method = mod_authorize }, { .name1 = "authenticate", .name2 = CF_IDENT_ANY, .method = mod_authenticate }, { .name1 = "send", .name2 = CF_IDENT_ANY, .method = mod_post_auth }, diff --git a/src/modules/rlm_exec/rlm_exec.c b/src/modules/rlm_exec/rlm_exec.c index 1da167dc20c..3e20b819442 100644 --- a/src/modules/rlm_exec/rlm_exec.c +++ b/src/modules/rlm_exec/rlm_exec.c @@ -481,7 +481,7 @@ module_rlm_t rlm_exec = { .bootstrap = mod_bootstrap, .instantiate = mod_instantiate }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = CF_IDENT_ANY, .name2 = CF_IDENT_ANY, .method = mod_exec_dispatch }, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_files/rlm_files.c b/src/modules/rlm_files/rlm_files.c index 72adeab0365..0c264903af6 100644 --- a/src/modules/rlm_files/rlm_files.c +++ b/src/modules/rlm_files/rlm_files.c @@ -679,7 +679,7 @@ module_rlm_t rlm_files = { .config = module_config, .instantiate = mod_instantiate }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ /* * Hack to support old configurations */ diff --git a/src/modules/rlm_imap/rlm_imap.c b/src/modules/rlm_imap/rlm_imap.c index 79ffb4725c4..df1a8ee4da5 100644 --- a/src/modules/rlm_imap/rlm_imap.c +++ b/src/modules/rlm_imap/rlm_imap.c @@ -218,7 +218,7 @@ module_rlm_t rlm_imap = { .thread_instantiate = mod_thread_instantiate, .thread_detach = mod_thread_detach, }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "authenticate", .name2 = CF_IDENT_ANY, .method = mod_authenticate }, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c b/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c index c28da76b871..2340b7069ba 100644 --- a/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c +++ b/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c @@ -2239,7 +2239,7 @@ module_rlm_t rlm_isc_dhcp = { .config = module_config, .instantiate = mod_instantiate }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "recv", .name2 = CF_IDENT_ANY, .method = mod_authorize }, { .name1 = "send", .name2 = CF_IDENT_ANY, .method = mod_post_auth }, MODULE_NAME_TERMINATOR diff --git a/src/modules/rlm_krb5/rlm_krb5.c b/src/modules/rlm_krb5/rlm_krb5.c index ab8e7e9d49d..32e1fe5bcfd 100644 --- a/src/modules/rlm_krb5/rlm_krb5.c +++ b/src/modules/rlm_krb5/rlm_krb5.c @@ -503,7 +503,7 @@ module_rlm_t rlm_krb5 = { .instantiate = mod_instantiate, .detach = mod_detach }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "authenticate", .name2 = CF_IDENT_ANY, .method = mod_authenticate }, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c index 88e332c2a5c..7b908e590f3 100644 --- a/src/modules/rlm_ldap/rlm_ldap.c +++ b/src/modules/rlm_ldap/rlm_ldap.c @@ -2031,7 +2031,7 @@ module_rlm_t rlm_ldap = { .thread_instantiate = mod_thread_instatiate, .thread_detach = mod_thread_detach, }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ /* * Hack to support old configurations */ diff --git a/src/modules/rlm_linelog/rlm_linelog.c b/src/modules/rlm_linelog/rlm_linelog.c index 02e09c46342..9434ae3096a 100644 --- a/src/modules/rlm_linelog/rlm_linelog.c +++ b/src/modules/rlm_linelog/rlm_linelog.c @@ -800,7 +800,7 @@ module_rlm_t rlm_linelog = { .instantiate = mod_instantiate, .detach = mod_detach }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = CF_IDENT_ANY, .name2 = CF_IDENT_ANY, .method = mod_do_linelog }, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_logintime/rlm_logintime.c b/src/modules/rlm_logintime/rlm_logintime.c index 636608d5a86..0217b632260 100644 --- a/src/modules/rlm_logintime/rlm_logintime.c +++ b/src/modules/rlm_logintime/rlm_logintime.c @@ -269,7 +269,7 @@ module_rlm_t rlm_logintime = { .config = module_config, .instantiate = mod_instantiate }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = CF_IDENT_ANY, .name2 = CF_IDENT_ANY, .method = mod_authorize }, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_logtee/rlm_logtee.c b/src/modules/rlm_logtee/rlm_logtee.c index 797a9d5b6df..a8d750cdb88 100644 --- a/src/modules/rlm_logtee/rlm_logtee.c +++ b/src/modules/rlm_logtee/rlm_logtee.c @@ -665,7 +665,7 @@ module_rlm_t rlm_logtee = { .instantiate = mod_instantiate, .thread_instantiate = mod_thread_instantiate, }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = CF_IDENT_ANY, .name2 = CF_IDENT_ANY, .method = mod_insert_logtee }, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_lua/rlm_lua.c b/src/modules/rlm_lua/rlm_lua.c index 8a02e54e9a6..75efecc6342 100644 --- a/src/modules/rlm_lua/rlm_lua.c +++ b/src/modules/rlm_lua/rlm_lua.c @@ -181,7 +181,7 @@ module_rlm_t rlm_lua = { .detach = mod_detach, .thread_detach = mod_thread_detach }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ /* * Hack to support old configurations */ diff --git a/src/modules/rlm_mruby/rlm_mruby.c b/src/modules/rlm_mruby/rlm_mruby.c index 79d198f0273..80f9f7206a5 100644 --- a/src/modules/rlm_mruby/rlm_mruby.c +++ b/src/modules/rlm_mruby/rlm_mruby.c @@ -517,7 +517,7 @@ module_rlm_t rlm_mruby = { .instantiate = mod_instantiate, .detach = mod_detach, }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ /* * Hack to support old configurations */ diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c index feeb62e7edb..2ca0f487475 100644 --- a/src/modules/rlm_mschap/rlm_mschap.c +++ b/src/modules/rlm_mschap/rlm_mschap.c @@ -2313,7 +2313,7 @@ module_rlm_t rlm_mschap = { .instantiate = mod_instantiate, .detach = mod_detach }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "recv", .name2 = CF_IDENT_ANY, .method = mod_authorize }, { .name1 = "authenticate", .name2 = CF_IDENT_ANY, .method = mod_authenticate }, MODULE_NAME_TERMINATOR diff --git a/src/modules/rlm_opendirectory/rlm_opendirectory.c b/src/modules/rlm_opendirectory/rlm_opendirectory.c index 86f6a8474ae..27a70afc226 100644 --- a/src/modules/rlm_opendirectory/rlm_opendirectory.c +++ b/src/modules/rlm_opendirectory/rlm_opendirectory.c @@ -537,7 +537,7 @@ module_rlm_t rlm_opendirectory = { .type = MODULE_TYPE_THREAD_SAFE, .instantiate = mod_instantiate }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "recv", .name2 = CF_IDENT_ANY, .method = mod_authorize }, { .name1 = "authenticate", .name2 = CF_IDENT_ANY, .method = mod_authenticate }, MODULE_NAME_TERMINATOR diff --git a/src/modules/rlm_pam/rlm_pam.c b/src/modules/rlm_pam/rlm_pam.c index 85c5abb7961..2bb8622a656 100644 --- a/src/modules/rlm_pam/rlm_pam.c +++ b/src/modules/rlm_pam/rlm_pam.c @@ -277,7 +277,7 @@ module_rlm_t rlm_pam = { .config = module_config, .instantiate = mod_instantiate }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "authenticate", .name2 = CF_IDENT_ANY, .method = mod_authenticate }, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c index 5ad3e2e57e2..7196432562c 100644 --- a/src/modules/rlm_pap/rlm_pap.c +++ b/src/modules/rlm_pap/rlm_pap.c @@ -1082,7 +1082,7 @@ module_rlm_t rlm_pap = { .config = module_config, .instantiate = mod_instantiate }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ /* * Hack to support old configurations */ diff --git a/src/modules/rlm_passwd/rlm_passwd.c b/src/modules/rlm_passwd/rlm_passwd.c index 7ee19cad362..751996d02aa 100644 --- a/src/modules/rlm_passwd/rlm_passwd.c +++ b/src/modules/rlm_passwd/rlm_passwd.c @@ -618,7 +618,7 @@ module_rlm_t rlm_passwd = { .instantiate = mod_instantiate, .detach = mod_detach }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = CF_IDENT_ANY, .name2 = CF_IDENT_ANY, .method = mod_passwd_map }, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c index 04081d754c0..66b83c78cdf 100644 --- a/src/modules/rlm_perl/rlm_perl.c +++ b/src/modules/rlm_perl/rlm_perl.c @@ -1253,7 +1253,7 @@ module_rlm_t rlm_perl = { .thread_instantiate = mod_thread_instantiate, .thread_detach = mod_thread_detach, }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ /* * Hack to support old configurations */ diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c index 372cffc2b78..4f0a2e4de01 100644 --- a/src/modules/rlm_python/rlm_python.c +++ b/src/modules/rlm_python/rlm_python.c @@ -1146,7 +1146,7 @@ module_rlm_t rlm_python = { .thread_instantiate = mod_thread_instantiate, .thread_detach = mod_thread_detach }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ /* * Hack to support old configurations */ diff --git a/src/modules/rlm_radius/rlm_radius.c b/src/modules/rlm_radius/rlm_radius.c index 3ed516ae27d..203a618faf5 100644 --- a/src/modules/rlm_radius/rlm_radius.c +++ b/src/modules/rlm_radius/rlm_radius.c @@ -664,7 +664,7 @@ module_rlm_t rlm_radius = { .bootstrap = mod_bootstrap, }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = CF_IDENT_ANY, .name2 = CF_IDENT_ANY, .method = mod_process }, MODULE_NAME_TERMINATOR }, diff --git a/src/modules/rlm_radutmp/rlm_radutmp.c b/src/modules/rlm_radutmp/rlm_radutmp.c index 12f0069fbb4..bf5ab0034d8 100644 --- a/src/modules/rlm_radutmp/rlm_radutmp.c +++ b/src/modules/rlm_radutmp/rlm_radutmp.c @@ -566,7 +566,7 @@ module_rlm_t rlm_radutmp = { .inst_size = sizeof(rlm_radutmp_t), .config = module_config }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "accounting", .name2 = CF_IDENT_ANY, .method = mod_accounting }, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c index 58b0112e7e3..eecb0ee4cf2 100644 --- a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c +++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c @@ -1437,7 +1437,7 @@ module_rlm_t rlm_redis_ippool = { .onload = mod_load, .instantiate = mod_instantiate }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ /* * RADIUS specific */ diff --git a/src/modules/rlm_rediswho/rlm_rediswho.c b/src/modules/rlm_rediswho/rlm_rediswho.c index dacf70a5669..642f5150b79 100644 --- a/src/modules/rlm_rediswho/rlm_rediswho.c +++ b/src/modules/rlm_rediswho/rlm_rediswho.c @@ -258,7 +258,7 @@ module_rlm_t rlm_rediswho = { .onload = mod_load, .instantiate = mod_instantiate }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "accounting", .name2 = CF_IDENT_ANY, .method = mod_accounting }, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c index 94af8d9f418..965f015847f 100644 --- a/src/modules/rlm_rest/rlm_rest.c +++ b/src/modules/rlm_rest/rlm_rest.c @@ -1246,7 +1246,7 @@ module_rlm_t rlm_rest = { .thread_instantiate = mod_thread_instantiate, .thread_detach = mod_thread_detach }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ /* * Hack to support old configurations */ diff --git a/src/modules/rlm_securid/rlm_securid.c b/src/modules/rlm_securid/rlm_securid.c index 636137ba933..cf14cfcb502 100644 --- a/src/modules/rlm_securid/rlm_securid.c +++ b/src/modules/rlm_securid/rlm_securid.c @@ -560,7 +560,7 @@ module_rlm_t rlm_securid = { .instantiate = mod_instantiate, .detach = mod_detach }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "authenticate", .name2 = CF_IDENT_ANY, .method = mod_authenticate }, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_sigtran/rlm_sigtran.c b/src/modules/rlm_sigtran/rlm_sigtran.c index 3ca04a1e55a..47ea79e4c0f 100644 --- a/src/modules/rlm_sigtran/rlm_sigtran.c +++ b/src/modules/rlm_sigtran/rlm_sigtran.c @@ -435,7 +435,7 @@ module_rlm_t rlm_sigtran = { .thread_instantiate = mod_thread_instantiate, .thread_detach = mod_thread_detach }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = CF_IDENT_ANY, .name2 = CF_IDENT_ANY, .method = mod_authorize }, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_smtp/rlm_smtp.c b/src/modules/rlm_smtp/rlm_smtp.c index 4a6ba85d971..0c3672d2621 100644 --- a/src/modules/rlm_smtp/rlm_smtp.c +++ b/src/modules/rlm_smtp/rlm_smtp.c @@ -1113,7 +1113,7 @@ module_rlm_t rlm_smtp = { .thread_instantiate = mod_thread_instantiate, .thread_detach = mod_thread_detach, }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "recv", .name2 = CF_IDENT_ANY, .method = mod_authorize }, { .name1 = "authenticate", .name2 = CF_IDENT_ANY, .method = mod_authenticate }, MODULE_NAME_TERMINATOR diff --git a/src/modules/rlm_soh/rlm_soh.c b/src/modules/rlm_soh/rlm_soh.c index ca3f6f4181f..80e97a5b12a 100644 --- a/src/modules/rlm_soh/rlm_soh.c +++ b/src/modules/rlm_soh/rlm_soh.c @@ -303,7 +303,7 @@ module_rlm_t rlm_soh = { .unload = mod_unload, .bootstrap = mod_bootstrap }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "recv", .name2 = CF_IDENT_ANY, .method = mod_authorize }, { .name1 = "send", .name2 = CF_IDENT_ANY, .method = mod_post_auth }, MODULE_NAME_TERMINATOR diff --git a/src/modules/rlm_sometimes/rlm_sometimes.c b/src/modules/rlm_sometimes/rlm_sometimes.c index 96a50783ee2..5287ade5b4b 100644 --- a/src/modules/rlm_sometimes/rlm_sometimes.c +++ b/src/modules/rlm_sometimes/rlm_sometimes.c @@ -162,7 +162,7 @@ module_rlm_t rlm_sometimes = { .config = module_config, .instantiate = mod_instantiate }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "send", .name2 = CF_IDENT_ANY, .method = mod_sometimes_reply }, { .name1 = CF_IDENT_ANY, .name2 = CF_IDENT_ANY, .method = mod_sometimes_packet }, MODULE_NAME_TERMINATOR diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c index 9cab330efaf..4d3130043e9 100644 --- a/src/modules/rlm_sql/rlm_sql.c +++ b/src/modules/rlm_sql/rlm_sql.c @@ -1620,7 +1620,7 @@ module_rlm_t rlm_sql = { .instantiate = mod_instantiate, .detach = mod_detach }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ /* * Hack to support old configurations */ diff --git a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c index 46eebccfe81..5efedd69141 100644 --- a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c +++ b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c @@ -641,7 +641,7 @@ module_rlm_t rlm_sqlcounter = { .bootstrap = mod_bootstrap, .instantiate = mod_instantiate, }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = CF_IDENT_ANY, .name2 = CF_IDENT_ANY, .method = mod_authorize}, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_sqlippool/rlm_sqlippool.c b/src/modules/rlm_sqlippool/rlm_sqlippool.c index b8cd883fe15..453c954e58f 100644 --- a/src/modules/rlm_sqlippool/rlm_sqlippool.c +++ b/src/modules/rlm_sqlippool/rlm_sqlippool.c @@ -865,7 +865,7 @@ module_rlm_t rlm_sqlippool = { .bootstrap = mod_bootstrap, .instantiate = mod_instantiate }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "accounting", .name2 = CF_IDENT_ANY, .method = mod_accounting }, { .name1 = "send", .name2 = CF_IDENT_ANY, .method = mod_alloc }, diff --git a/src/modules/rlm_stats/rlm_stats.c b/src/modules/rlm_stats/rlm_stats.c index 87be64dbbed..9104cf2d854 100644 --- a/src/modules/rlm_stats/rlm_stats.c +++ b/src/modules/rlm_stats/rlm_stats.c @@ -446,7 +446,7 @@ module_rlm_t rlm_stats = { .thread_instantiate = mod_thread_instantiate, .thread_detach = mod_thread_detach }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = CF_IDENT_ANY, .name2 = CF_IDENT_ANY, .method = mod_stats }, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_test/rlm_test.c b/src/modules/rlm_test/rlm_test.c index 1b3d0bd9477..ec80560f153 100644 --- a/src/modules/rlm_test/rlm_test.c +++ b/src/modules/rlm_test/rlm_test.c @@ -519,7 +519,7 @@ module_rlm_t rlm_test = { .thread_instantiate = mod_thread_instantiate, .thread_detach = mod_thread_detach }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "recv", .name2 = "accounting-request", .method = mod_preacct }, { .name1 = "recv", .name2 = CF_IDENT_ANY, .method = mod_authorize }, { .name1 = "accounting", .name2 = CF_IDENT_ANY, .method = mod_accounting }, diff --git a/src/modules/rlm_totp/rlm_totp.c b/src/modules/rlm_totp/rlm_totp.c index 4a1f840c767..36d32c7286d 100644 --- a/src/modules/rlm_totp/rlm_totp.c +++ b/src/modules/rlm_totp/rlm_totp.c @@ -293,7 +293,7 @@ module_rlm_t rlm_totp = { .name = "totp", .type = MODULE_TYPE_THREAD_SAFE }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "authenticate", .name2 = CF_IDENT_ANY, .method = mod_authenticate }, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c index ffcc41f0141..b214a0d25c0 100644 --- a/src/modules/rlm_unix/rlm_unix.c +++ b/src/modules/rlm_unix/rlm_unix.c @@ -516,7 +516,7 @@ module_rlm_t rlm_unix = { .config = module_config, .bootstrap = mod_bootstrap }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "recv", .name2 = "access-request", .method = mod_authorize }, { .name1 = "accounting", .name2 = CF_IDENT_ANY, .method = mod_accounting }, MODULE_NAME_TERMINATOR diff --git a/src/modules/rlm_utf8/rlm_utf8.c b/src/modules/rlm_utf8/rlm_utf8.c index 0f92f67b00a..c68c6b1037f 100644 --- a/src/modules/rlm_utf8/rlm_utf8.c +++ b/src/modules/rlm_utf8/rlm_utf8.c @@ -64,7 +64,7 @@ module_rlm_t rlm_utf8 = { .name = "utf8", .type = MODULE_TYPE_THREAD_SAFE }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = CF_IDENT_ANY, .name2 = CF_IDENT_ANY, .method = mod_utf8_clean }, MODULE_NAME_TERMINATOR } diff --git a/src/modules/rlm_wimax/rlm_wimax.c b/src/modules/rlm_wimax/rlm_wimax.c index fa95b8f756f..289053d722b 100644 --- a/src/modules/rlm_wimax/rlm_wimax.c +++ b/src/modules/rlm_wimax/rlm_wimax.c @@ -463,7 +463,7 @@ module_rlm_t rlm_wimax = { .config = module_config, }, .dict = &dict_radius, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "recv", .name2 = "accounting-request", .method = mod_preacct }, { .name1 = "recv", .name2 = CF_IDENT_ANY, .method = mod_authorize }, { .name1 = "send", .name2 = CF_IDENT_ANY, .method = mod_post_auth }, diff --git a/src/modules/rlm_winbind/rlm_winbind.c b/src/modules/rlm_winbind/rlm_winbind.c index 82935620249..a3f3777d35e 100644 --- a/src/modules/rlm_winbind/rlm_winbind.c +++ b/src/modules/rlm_winbind/rlm_winbind.c @@ -565,7 +565,7 @@ module_rlm_t rlm_winbind = { .bootstrap = mod_bootstrap, .detach = mod_detach }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "recv", .name2 = CF_IDENT_ANY, .method = mod_authorize }, { .name1 = "authenticate", .name2 = CF_IDENT_ANY, .method = mod_authenticate }, MODULE_NAME_TERMINATOR diff --git a/src/modules/rlm_yubikey/rlm_yubikey.c b/src/modules/rlm_yubikey/rlm_yubikey.c index 04192f504ce..985cffd4f07 100644 --- a/src/modules/rlm_yubikey/rlm_yubikey.c +++ b/src/modules/rlm_yubikey/rlm_yubikey.c @@ -470,7 +470,7 @@ module_rlm_t rlm_yubikey = { .detach = mod_detach, #endif }, - .method_names = (module_method_names_t[]){ + .method_names = (module_method_name_t[]){ { .name1 = "recv", .name2 = "access-request", .method = mod_authorize }, { .name1 = "authenticate", .name2 = CF_IDENT_ANY, .method = mod_authenticate }, MODULE_NAME_TERMINATOR diff --git a/src/tests/modules/test/section_names.unlang b/src/tests/modules/test/section_names.unlang index f979653d642..3a02a35ea61 100644 --- a/src/tests/modules/test/section_names.unlang +++ b/src/tests/modules/test/section_names.unlang @@ -1,10 +1,4 @@ -# .methods = { -# [MOD_AUTHENTICATE] = mod_authenticate, -# [MOD_AUTHORIZE] = mod_authorize, -# [MOD_PREACCT] = mod_preacct, -# [MOD_ACCOUNTING] = mod_accounting, -# }, -# .method_names = (module_method_names_t[]){ +# .method_names = (module_method_name_t[]){ # { .name1 = "recv", .name2 = "Access-Challenge", .method = mod_return }, # { .name1 = "name1_null", .name2 = NULL, .method = mod_return }, # { .name1 = "send", .name2 = CF_IDENT_ANY, .method = mod_return },