unlang: Component isn't used for module compilation anymore

diff --git a/src/lib/server/module_rlm.c b/src/lib/server/module_rlm.c
index 4992d72c96d693a58df23b786cc55dc932dc9058..48a002b278dc742522c149aa06e31f9f925fc7e8 100644 (file)
--- a/src/lib/server/module_rlm.c
+++ b/src/lib/server/module_rlm.c
@@ -421,7 +421,6 @@ bool module_rlm_section_type_set(request_t *request, fr_dict_attr_t const *type_
  *
  * @param[out] method          the method function we will call
  * @param[out] method_env      the module_call_env to evaluate when compiling the method.
- * @param[in,out] component    the default component to use.  Updated to be the found component
  * @param[out] name1           name1 of the method being called
  * @param[out] name2           name2 of the method being called
  * @param[in] name             The name of the module we're attempting to find, possibly concatenated with the method
@@ -432,7 +431,6 @@ bool module_rlm_section_type_set(request_t *request, fr_dict_attr_t const *type_
  *  If the module exists but the method doesn't exist, then `method` is set to NULL.
  */
 module_instance_t *module_rlm_by_name_and_method(module_method_t *method, call_method_env_t const **method_env,
-                                                UNUSED rlm_components_t *component,
                                                 char const **name1, char const **name2,
                                                 char const *name)
 {
@@ -876,7 +874,7 @@ static int module_rlm_bootstrap_virtual(CONF_SECTION *cs)
                         *      want to know if we need to register a
                         *      redundant xlat for the virtual module.
                         */
-                       mi = module_rlm_by_name_and_method(NULL, NULL, NULL, NULL, NULL, cf_pair_attr(cp));
+                       mi = module_rlm_by_name_and_method(NULL, NULL, NULL, NULL, cf_pair_attr(cp));
                        if (!mi) {
                                cf_log_err(sub_ci, "Module instance \"%s\" referenced in %s block, does not exist",
                                           cf_pair_attr(cp), cf_section_name1(cs));

diff --git a/src/lib/server/module_rlm.h b/src/lib/server/module_rlm.h
index 4eb10f38aeecdc0decbbd922aea6d989b54f0697..55aac714c60ae98ad53b1b6d9932a54ef5d62d0f 100644 (file)
--- a/src/lib/server/module_rlm.h
+++ b/src/lib/server/module_rlm.h
@@ -85,9 +85,8 @@ bool          module_rlm_section_type_set(request_t *request, fr_dict_attr_t const *type
  * @{
  */
 module_instance_t      *module_rlm_by_name_and_method(module_method_t *method, call_method_env_t const ** method_env,
-                                                  rlm_components_t *component,
-                                                  char const **name1, char const **name2,
-                                                  char const *asked_name);
+                                                      char const **name1, char const **name2,
+                                                      char const *asked_name);
 
 module_thread_instance_t *module_rlm_thread_by_data(void const *data);
 

diff --git a/src/lib/unlang/compile.c b/src/lib/unlang/compile.c
index 1949312ef41cf47f968cdf5be5e8f0006d46a09c..def10fd13fd8e3cde4654c91a4122b2336a197b9 100644 (file)
--- a/src/lib/unlang/compile.c
+++ b/src/lib/unlang/compile.c
@@ -4965,7 +4965,7 @@ check_for_module:
         *      name2, etc.
         */
        UPDATE_CTX2;
-       inst = module_rlm_by_name_and_method(&method, &method_env, &unlang_ctx2.component,
+       inst = module_rlm_by_name_and_method(&method, &method_env,
                                             &unlang_ctx2.section_name1, &unlang_ctx2.section_name2,
                                             realname);
        if (inst) {