From: Nick Porter <nick@portercomputing.co.uk>
Date: Tue, 26 Nov 2024 13:50:07 +0000 (+0000)
Subject: Remove legacy functions from sql driver data
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b4f1ab09b13d89d18552c838ce86ef702d45ba1;p=thirdparty%2Ffreeradius-server.git

Remove legacy functions from sql driver data
---

diff --git a/src/modules/rlm_sql/rlm_sql.h b/src/modules/rlm_sql/rlm_sql.h
index 089c2a9b1de..30fa8c92e66 100644
--- a/src/modules/rlm_sql/rlm_sql.h
+++ b/src/modules/rlm_sql/rlm_sql.h
@@ -203,12 +203,6 @@ typedef struct {
 
 	int		flags;
 
-	sql_rcode_t	(*sql_socket_init)(rlm_sql_handle_t *handle, rlm_sql_config_t const *config,
-					   fr_time_delta_t timeout);
-
-	unlang_function_t	sql_query;			//!< Run an SQL query on a pool connection.
-	unlang_function_t	sql_select_query;		//!< Run an SQL select query on a pool connection.
-
 	unlang_function_t	sql_query_resume;		//!< Callback run after an SQL trunk query is run.
 	unlang_function_t	sql_select_query_resume;	//!< Callback run after an SQL select trunk query is run.
 
diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c
index 6e5d5d3a0fb..a63be357d0c 100644
--- a/src/modules/rlm_sql/sql.c
+++ b/src/modules/rlm_sql/sql.c
@@ -416,7 +416,6 @@ unlang_action_t rlm_sql_query(rlm_rcode_t *p_result, UNUSED int *priority, reque
 	for (i = 0; i < (count + 1); i++) {
 		ROPTIONAL(RDEBUG2, DEBUG2, "Executing query: %s", query_ctx->query_str);
 
-		(inst->driver->sql_query)(p_result, NULL, request, query_ctx);
 		query_ctx->status = SQL_QUERY_SUBMITTED;
 		switch (query_ctx->rcode) {
 		case RLM_SQL_OK:
@@ -608,7 +607,6 @@ unlang_action_t rlm_sql_select_query(rlm_rcode_t *p_result, UNUSED int *priority
 	for (i = 0; i < (count + 1); i++) {
 		ROPTIONAL(RDEBUG2, DEBUG2, "Executing select query: %s", query_ctx->query_str);
 
-		(inst->driver->sql_select_query)(p_result, NULL, request, query_ctx);
 		query_ctx->status = SQL_QUERY_SUBMITTED;
 		switch (query_ctx->rcode) {
 		case RLM_SQL_OK: