From: Nick Porter <nick@portercomputing.co.uk>
Date: Mon, 14 Oct 2024 16:35:41 +0000 (+0100)
Subject: Don't call query finish when not needed
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd6cfbe1ba2640b6a15107149c30d7f800203d8e;p=thirdparty%2Ffreeradius-server.git

Don't call query finish when not needed

sqlippool_result_process is already calling query finish
---

diff --git a/src/modules/rlm_sqlippool/rlm_sqlippool.c b/src/modules/rlm_sqlippool/rlm_sqlippool.c
index 81a384600ec..b4e42b572f4 100644
--- a/src/modules/rlm_sqlippool/rlm_sqlippool.c
+++ b/src/modules/rlm_sqlippool/rlm_sqlippool.c
@@ -316,7 +316,6 @@ static unlang_action_t mod_alloc_resume(rlm_rcode_t *p_result, UNUSED int *prior
 		if (query_ctx->rcode != RLM_SQL_OK) goto error;
 
 		allocation_len = sqlippool_result_process(allocation, sizeof(allocation), query_ctx);
-		sql->driver->sql_finish_select_query(query_ctx, &query_ctx->inst->config);
 		if (allocation_len > 0) goto make_pair;
 
 		/*
@@ -341,7 +340,6 @@ static unlang_action_t mod_alloc_resume(rlm_rcode_t *p_result, UNUSED int *prior
 		if (query_ctx->rcode != RLM_SQL_OK) goto error;
 
 		allocation_len = sqlippool_result_process(allocation, sizeof(allocation), query_ctx);
-		sql->driver->sql_finish_select_query(query_ctx, &query_ctx->inst->config);
 		if (allocation_len > 0) goto make_pair;
 
 	expand_find:
@@ -361,7 +359,6 @@ static unlang_action_t mod_alloc_resume(rlm_rcode_t *p_result, UNUSED int *prior
 		if (query_ctx->rcode != RLM_SQL_OK) goto error;
 
 		allocation_len = sqlippool_result_process(allocation, sizeof(allocation), query_ctx);
-		sql->driver->sql_finish_select_query(query_ctx, &query_ctx->inst->config);
 
 		if (allocation_len > 0) goto make_pair;
 
@@ -441,7 +438,6 @@ static unlang_action_t mod_alloc_resume(rlm_rcode_t *p_result, UNUSED int *prior
 	case IPPOOL_ALLOC_POOL_CHECK_RUN:
 		TALLOC_FREE(alloc_ctx->query);
 		allocation_len = sqlippool_result_process(allocation, sizeof(allocation), query_ctx);
-		sql->driver->sql_finish_select_query(query_ctx, &query_ctx->inst->config);
 
 		if (allocation_len) {
 			/*
@@ -473,7 +469,7 @@ static unlang_action_t mod_alloc_resume(rlm_rcode_t *p_result, UNUSED int *prior
 
 	case IPPOOL_ALLOC_UPDATE_RUN:
 		TALLOC_FREE(alloc_ctx->query);
-		sql->driver->sql_finish_query(query_ctx, &query_ctx->inst->config);
+		if (env->update) sql->driver->sql_finish_query(query_ctx, &query_ctx->inst->config);
 
 	finish:
 		if ((env->commit.type == FR_TYPE_STRING) &&