From 7e52d3c29d05f409f9ad75e01eb1f096e6261555 Mon Sep 17 00:00:00 2001 From: Nick Porter Date: Fri, 29 Aug 2025 17:01:13 +0100 Subject: [PATCH] Add trigger_args to rlm_sql --- src/modules/rlm_sql/rlm_sql.c | 12 +++++++++++- src/modules/rlm_sql/rlm_sql.h | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c index 1683dc25e5..2b9838d690 100644 --- a/src/modules/rlm_sql/rlm_sql.c +++ b/src/modules/rlm_sql/rlm_sql.c @@ -35,6 +35,7 @@ RCSID("$Id$") #include #include #include +#include #include #include #include @@ -2209,7 +2210,16 @@ static int mod_instantiate(module_inst_ctx_t const *mctx) return -1; } - return 0; + if (!inst->config.trunk_conf.conn_triggers) return 0; + + inst->trigger_args = fr_pair_list_alloc(inst); + return module_trigger_args_build(inst->trigger_args, inst->trigger_args, cf_section_find(conf, "pool", NULL), + &(module_trigger_args_t) { + .module = inst->mi->module->name, + .name = inst->name, + .server = inst->config.sql_server, + .port = inst->config.sql_port + }); } static int mod_bootstrap(module_inst_ctx_t const *mctx) diff --git a/src/modules/rlm_sql/rlm_sql.h b/src/modules/rlm_sql/rlm_sql.h index f8214adc36..f60a9b1a6d 100644 --- a/src/modules/rlm_sql/rlm_sql.h +++ b/src/modules/rlm_sql/rlm_sql.h @@ -248,6 +248,8 @@ struct sql_inst { fr_dict_attr_t const *group_da; //!< Group dictionary attribute. fr_dict_attr_t const *query_number_da; //!< Query number attribute. module_instance_t const *mi; //!< Module instance data for thread lookups. + + fr_pair_list_t *trigger_args; //!< Pairs passed to trigger request. }; unlang_action_t sql_get_map_list(unlang_result_t *p_result, request_t *request, fr_sql_map_ctx_t *map_ctx, trunk_t *trunk); -- 2.47.3