s/module_method_names_t/module_method_name_t/

diff --git a/src/lib/server/module.h b/src/lib/server/module.h
index faff657d85353bc3f29e3f40bf6dfd1f4cebc00c..abbf4ee8fbba3502a51a5b3e2967dcc97d0bb896 100644 (file)
--- a/src/lib/server/module.h
+++ b/src/lib/server/module.h
@@ -38,7 +38,7 @@ extern "C" {
 #include <freeradius-devel/util/event.h>
 
 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 7e0685c078ef765ec530cfa98c551469ab183f30..e178eeadb384b82eff569c80b17de96254190257 100644 (file)
--- 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 6b3641139b86f76188e0ca959ea94dbaeca3b286..aaeabf3091921ca542ed2fe74a5e154f644713c4 100644 (file)
--- 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 fdcdcd8e725feecee48950f73af12953e6eb7e4f..1423fa9da359ab4893d25705003e043c5bf427eb 100644 (file)
--- 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 bf12e4f2872f023f0f282c51743c5ffc5e037c28..83b338fc9a37d67946de6b12c3860b09d757a725 100644 (file)
--- 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 9792a4db7b6e53ca91caf680bf3b6a282d471a1d..fc8fa68478da67bace3909d6360cb17d9357db11 100644 (file)
--- 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 4e08c49b33bf2013a3911f04b76b2aa20f393a87..efbed76db4ee091af25d9e6d793414b478a7ab31 100644 (file)
--- 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 ced01386567f7ad6b294ac966ec32a6cdd5bc075..ad0362bb3861811651fd5a20caede5290c7cdf69 100644 (file)
--- 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 93cdd62bd95b3384f5e21acc4522a09aa6ddf19d..15012925d42ba439812511ccf3a9ed6be4eb2aa3 100644 (file)
--- 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 0b0d820ea4de76148dd88ff992e6b751a0a7233c..0c8f8c33b32bc5e5a06538d297bacb54198dee29 100644 (file)
--- 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 53d8501396ef657961cfbd5f27ff5943004d3034..a914acc189db4a2decf9c9770577f094804d0198 100644 (file)
--- 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 0c77049dae72c000232c005e89df1f9003e51681..233e1e18a4db4c2fc99dbf727f483be9cdb52dcc 100644 (file)
--- 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 5a1ab6d777fe1b91ccba277eb4b02b0f55ae4534..ca6eb4f147b715c310954c52ffda3b404ec27888 100644 (file)
--- 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 5007ed9910e77d9f0ee5288dbe960500ea0238b0..2438f10b3041eac92fb731c37e883a6ccd47ac25 100644 (file)
--- 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 04c206af7a873721fbe9b239dd5cfcbabfb5c639..d7abc663c3aa91845dfee64f982cf57a13847517 100644 (file)
--- 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 1da167dc20ce571388762e1094ff45b8b6ef31f1..3e20b819442c22f4b7ac740b5ec732b580bde095 100644 (file)
--- 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 72adeab03659eb0f2c10e03c393a54c8237a5ed3..0c264903af613b96854ae2a311f6507a9dbfb9b3 100644 (file)
--- 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 79ffb4725c452f44d005a2ae47776631b78faf3c..df1a8ee4da56584b524565a99cbfbfb2fc208f36 100644 (file)
--- 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 c28da76b87112f18ff03fe9c9dd5a866fc52b9d5..2340b7069bae64b1ef566bd02007036c2eeedd9e 100644 (file)
--- 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 ab8e7e9d49d6f464c34e09f2b172183480b2fb49..32e1fe5bcfdec06d1b957522bc9c5f1545d98767 100644 (file)
--- 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 88e332c2a5c60f4ae2d3b3ffa0e7fd02b8214430..7b908e590f33108cc68a991014b18da0f500426a 100644 (file)
--- 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 02e09c46342165fd3874b1ab8642a1f23f3e73a7..9434ae3096a115b2f36c7cc68ddbe7fdebd8ad87 100644 (file)
--- 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 636608d5a86f7cd8e98c2de5827e7da22381f175..0217b63226029580bd996dfd2745ebeeb67ea440 100644 (file)
--- 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 797a9d5b6dfe7ce61b87384f57d139ac9155e33a..a8d750cdb8882e55c5a3d0b9514ad1803f95bb0f 100644 (file)
--- 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 8a02e54e9a65c44955161677b9b6416d9958cbb8..75efecc63427921d61d55b4fa617cb56bbbf5c5f 100644 (file)
--- 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 79d198f02732b9f2d1f834ad510ff459f4da9544..80f9f7206a52e8b8a6ca841a77a8fd9bcfe87fb8 100644 (file)
--- 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 feeb62e7edb8f8466eb529ee8d52440eb377ef74..2ca0f487475bc06d7d9361143021872c7c7d8ef3 100644 (file)
--- 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 86f6a8474ae8bb0e1d5326ba27e1f7e6819068a1..27a70afc226c2420a9e6b97e779d8dd673ea07f6 100644 (file)
--- 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 85c5abb79615c6d86b2348b57326e14617d1acd2..2bb8622a6562121eceb4c5bdb40d29e463c0a81c 100644 (file)
--- 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 5ad3e2e57e27f1b2aeecb43c7b1bb63f184f4e82..7196432562ccd440ab00b6f9e98beaa54f99f744 100644 (file)
--- 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 7ee19cad362315d7ad25d1bbf163a9874dae9dfd..751996d02aa7a0597050b95fa0c25876e8f694f6 100644 (file)
--- 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 04081d754c036f6ebd18def27482e956798d94cd..66b83c78cdf31f50da67f823c2a4053272a17cfc 100644 (file)
--- 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 372cffc2b7876fd6690a75bef3929d3f068c5ad8..4f0a2e4de01dba6e9f5a7d84ac3ddb5014bf6f47 100644 (file)
--- 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 3ed516ae27d35b23a2163c69302b9a92311ed357..203a618faf547bce88d5450c01688f94a0a965fa 100644 (file)
--- 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 12f0069fbb4fb9ec76248fbac7e9e2a419555115..bf5ab0034d82e4ce4dd27d9ad1b957a9003ee6bc 100644 (file)
--- 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 58b0112e7e320fa3c4e35b94385a06968c066edf..eecb0ee4cf2adbb21c1c2eb979cb0c8462b8d546 100644 (file)
--- 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 dacf70a566908737bbde3f0d4ff61ab32750c897..642f5150b79b92accfff6d22897aa4d5d0e0583a 100644 (file)
--- 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 94af8d9f418bcb34027701cb0e968dad8c823311..965f015847fb05a86175f53b1c699c512cb6babb 100644 (file)
--- 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 636137ba933d3d3fc785bda53b5cc73e2b1621e8..cf14cfcb5029a229aba41cdc70c06a19d35d6925 100644 (file)
--- 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 3ca04a1e55aa78e984e0ac5707fd9b1c4ff56b8e..47ea79e4c0fa34d85972b97c12aaf0265f97bf8a 100644 (file)
--- 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 4a6ba85d971b5d86d0cd200e67b91ffd756177ee..0c3672d262116d6ec309eb4239375d5cda18abdd 100644 (file)
--- 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 ca3f6f4181f1a9898af6acbaf8525928a46b3279..80e97a5b12a25655231b5ef3b227c993bee79283 100644 (file)
--- 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 96a50783ee216d248b704f49877e0ba6d4331b54..5287ade5b4b3b0c51fb3e962d808f06d4760405f 100644 (file)
--- 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 9cab330efaf0d7d2e6b7fd2eaab2b93144212a6f..4d3130043e93c64aa6405a3dff662c06d7e5da34 100644 (file)
--- 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 46eebccfe8133b86598d761b2e489484e3b67ce7..5efedd69141fef3725edcb702758ff2b10256587 100644 (file)
--- 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 b8cd883fe157b1c4650aa43975e5d0eba271f96e..453c954e58f53f58400947c093eef42d0ae435eb 100644 (file)
--- 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 87be64dbbedbf8d2c0ec14d8805db2229f9da099..9104cf2d8540f6ac05e2121d8bc6cfdf98ddce94 100644 (file)
--- 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 1b3d0bd94778e619cf5e8bc172ac0b5ea350075b..ec80560f153e972ab310c877b9c98d7df53cc936 100644 (file)
--- 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 4a1f840c7671e8288200d13ec5efe3493f2b5684..36d32c7286d3afd07b3b65050d61e34039eb2edc 100644 (file)
--- 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 ffcc41f01417f57b67359077aaefb3305a6bcae3..b214a0d25c0ffe7a501b41ed10ebadeaed741837 100644 (file)
--- 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 0f92f67b00a31ce746ac74b689a17adab215d594..c68c6b1037f58aeac6aef4789b1f7ca6bb36d509 100644 (file)
--- 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 fa95b8f756fa1dcb883af295d47b19eeb470aa64..289053d722b764567f607afe71f24de7b0e1ce2a 100644 (file)
--- 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 829356202493682f11e622a1301f806836efb9a0..a3f3777d35e37dc99962debd93c2067d44d7a7c3 100644 (file)
--- 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 04192f504ce92b4b352f14fc2cf948a26b42b932..985cffd4f079cec6bf450c86a4dbfaa876cae087 100644 (file)
--- 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 f979653d642b9bf9fa8d626b13b90d4b6fc631fa..3a02a35ea61fdf7de5b004f5dc1985e63b01220a 100644 (file)
--- 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 },