From: Arran Cudbard-Bell Date: Thu, 3 Mar 2022 03:12:36 +0000 (-0600) Subject: Need to bootstrap sqlite _before_ rlm_sql does instantiation and creates the pool X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb893461f94683b646ba07f0ad563f5e452e8178;p=thirdparty%2Ffreeradius-server.git Need to bootstrap sqlite _before_ rlm_sql does instantiation and creates the pool --- diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c index e6e81754bdb..46de6365d07 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c @@ -683,7 +683,7 @@ static int sql_affected_rows(rlm_sql_handle_t *handle, return -1; } -static int mod_instantiate(module_inst_ctx_t const *mctx) +static int mod_bootstrap(module_inst_ctx_t const *mctx) { rlm_sql_t const *parent = talloc_get_type_abort(mctx->inst->parent->data, rlm_sql_t); rlm_sql_config_t const *config = &parent->config; @@ -820,7 +820,7 @@ rlm_sql_driver_t rlm_sql_sqlite = { .inst_size = sizeof(rlm_sql_sqlite_t), .config = driver_config, .onload = mod_load, - .instantiate = mod_instantiate + .bootstrap = mod_bootstrap }, .flags = RLM_SQL_RCODE_FLAGS_ALT_QUERY, .sql_socket_init = sql_socket_init,