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 3d2c63aa2a3ad957522edd95371dcaea53e0a4f7..36902ebc95023508852538dda9d1c668b1803803 100644 (file)
--- 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 ce09465c30a52a03cb0cb12e559aed888681fd58..12bfbe555bc7ec8fd69753e11b8fe3d15c6a85a7 100644 (file)
--- 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 36882ade2ec254deb57130226b1cec2f3ffddf15..46490eac5e930791cf57a68a3dc71e3898e22c08 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 = {
        },
         .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 c73f3b87d5489237d6db49c3c49911f2a36331e0..e88ebd77e3a5d0fcddafcb7c8df5f801cbad4110 100644 (file)
--- 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 8b9abb1ff5ae11db9442ca9aaf51c61961c1ff14..9df01471e531fed839a2316aa969314f8021dd64 100644 (file)
--- 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 c55462d0bd5d1824af49566f751cff3ef1e0d33c..f91c4258a8b5e1a02489e979be92a2a4f1fec621 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 = {
        },
        .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
        }
 };