From: Arran Cudbard-Bell Date: Fri, 7 Jun 2024 00:23:14 +0000 (-0400) Subject: Method names need to match section names exactly X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9eeb5b470c5da84c0c5ebc05fa41504175c6cc4d;p=thirdparty%2Ffreeradius-server.git Method names need to match section names exactly --- diff --git a/src/modules/rlm_chap/rlm_chap.c b/src/modules/rlm_chap/rlm_chap.c index 3d2c63aa2a3..36902ebc950 100644 --- a/src/modules/rlm_chap/rlm_chap.c +++ b/src/modules/rlm_chap/rlm_chap.c @@ -390,7 +390,7 @@ module_rlm_t rlm_chap = { }, .bindings = (module_method_binding_t[]){ { .section = SECTION_NAME("authenticate", CF_IDENT_ANY), .method = mod_authenticate, .method_env = &chap_auth_method_env }, - { .section = SECTION_NAME("recv", "access-request"), .method = mod_authorize, .method_env = &chap_autz_method_env }, + { .section = SECTION_NAME("recv", "Access-Request"), .method = mod_authorize, .method_env = &chap_autz_method_env }, MODULE_BINDING_TERMINATOR } }; diff --git a/src/modules/rlm_digest/rlm_digest.c b/src/modules/rlm_digest/rlm_digest.c index ce09465c30a..12bfbe555bc 100644 --- a/src/modules/rlm_digest/rlm_digest.c +++ b/src/modules/rlm_digest/rlm_digest.c @@ -482,7 +482,7 @@ module_rlm_t rlm_digest = { }, .bindings = (module_method_binding_t[]){ { .section = SECTION_NAME("authenticate", CF_IDENT_ANY), .method = mod_authenticate }, - { .section = SECTION_NAME("recv", "access-request"), .method = mod_authorize }, + { .section = SECTION_NAME("recv", "Access-Request"), .method = mod_authorize }, MODULE_BINDING_TERMINATOR }, }; diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c index 36882ade2ec..46490eac5e9 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 = { }, .bindings = (module_method_binding_t[]){ { .section = SECTION_NAME("authenticate", CF_IDENT_ANY), .method = mod_authenticate }, - { .section = SECTION_NAME("recv", "access-request"), .method = mod_authorize }, + { .section = SECTION_NAME("recv", "Access-Request"), .method = mod_authorize }, { .section = SECTION_NAME("send", CF_IDENT_ANY), .method = mod_post_auth }, MODULE_BINDING_TERMINATOR } diff --git a/src/modules/rlm_sqlippool/rlm_sqlippool.c b/src/modules/rlm_sqlippool/rlm_sqlippool.c index c73f3b87d54..e88ebd77e3a 100644 --- a/src/modules/rlm_sqlippool/rlm_sqlippool.c +++ b/src/modules/rlm_sqlippool/rlm_sqlippool.c @@ -691,10 +691,9 @@ static int sqlippool_box_escape(fr_value_box_t *vb, void *uctx) { * are dependent on the driver used by a given module instance. */ static int call_env_parse(TALLOC_CTX *ctx, void *out, tmpl_rules_t const *t_rules, CONF_ITEM *ci, - UNUSED char const *section_name1, UNUSED char const *section_name2, - void const *data, UNUSED call_env_parser_t const *rule) + call_env_ctx_t const *cec, UNUSED call_env_parser_t const *rule) { - rlm_sqlippool_t const *inst = talloc_get_type_abort_const(data, rlm_sqlippool_t); + rlm_sqlippool_t const *inst = talloc_get_type_abort_const(cec->mi->data, rlm_sqlippool_t); module_instance_t const *sql_inst; rlm_sql_t const *sql; tmpl_t *parsed_tmpl; @@ -820,12 +819,12 @@ module_rlm_t rlm_sqlippool = { /* * RADIUS specific */ - { .section = SECTION_NAME("recv", "access-request"), .method = mod_alloc, .method_env = &sqlippool_alloc_method_env }, - { .section = SECTION_NAME("accounting", "start"), .method = mod_common, .method_env = &sqlippool_update_method_env }, - { .section = SECTION_NAME("accounting", "alive"), .method = mod_common, .method_env = &sqlippool_update_method_env }, - { .section = SECTION_NAME("accounting", "stop"), .method = mod_common, .method_env = &sqlippool_release_method_env }, - { .section = SECTION_NAME("accounting", "accounting-on"), .method = mod_common, .method_env = &sqlippool_bulk_release_method_env }, - { .section = SECTION_NAME("accounting", "accounting-off"), .method = mod_common, .method_env = &sqlippool_bulk_release_method_env }, + { .section = SECTION_NAME("recv", "Access-Request"), .method = mod_alloc, .method_env = &sqlippool_alloc_method_env }, + { .section = SECTION_NAME("accounting", "Start"), .method = mod_common, .method_env = &sqlippool_update_method_env }, + { .section = SECTION_NAME("accounting", "Alive"), .method = mod_common, .method_env = &sqlippool_update_method_env }, + { .section = SECTION_NAME("accounting", "Stop"), .method = mod_common, .method_env = &sqlippool_release_method_env }, + { .section = SECTION_NAME("accounting", "Accounting-On"), .method = mod_common, .method_env = &sqlippool_bulk_release_method_env }, + { .section = SECTION_NAME("accounting", "Accounting-Off"), .method = mod_common, .method_env = &sqlippool_bulk_release_method_env }, /* * DHCPv4 diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c index 8b9abb1ff5a..9df01471e53 100644 --- a/src/modules/rlm_unix/rlm_unix.c +++ b/src/modules/rlm_unix/rlm_unix.c @@ -562,8 +562,8 @@ module_rlm_t rlm_unix = { }, .bindings = (module_method_binding_t[]){ { .section = SECTION_NAME("accounting", CF_IDENT_ANY), .method = mod_accounting }, - { .section = SECTION_NAME("recv", "access-request"), .method = mod_authorize }, - { .section = SECTION_NAME("send", "accounting-response"), .method = mod_accounting }, /* Backwards compatibility */ + { .section = SECTION_NAME("recv", "Access-Request"), .method = mod_authorize }, + { .section = SECTION_NAME("send", "Accounting-Response"), .method = mod_accounting }, /* Backwards compatibility */ MODULE_BINDING_TERMINATOR } }; diff --git a/src/modules/rlm_yubikey/rlm_yubikey.c b/src/modules/rlm_yubikey/rlm_yubikey.c index c55462d0bd5..f91c4258a8b 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 = { }, .bindings = (module_method_binding_t[]){ { .section = SECTION_NAME("authenticate", CF_IDENT_ANY), .method = mod_authenticate }, - { .section = SECTION_NAME("recv", "access-request"), .method = mod_authorize }, + { .section = SECTION_NAME("recv", "Access-Request"), .method = mod_authorize }, MODULE_BINDING_TERMINATOR } };