From: Nick Porter <nick@portercomputing.co.uk>
Date: Sat, 23 Nov 2024 13:45:43 +0000 (+0000)
Subject: mod_instantiate doesn't return RLM_SQL_*
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9e597c8eea2e4372cab2e56f117c5235fda44f7;p=thirdparty%2Ffreeradius-server.git

mod_instantiate doesn't return RLM_SQL_*
---

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
index 4c305249813..4dd26aace9d 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
@@ -668,7 +668,7 @@ do {\
 	CassError _ret;\
 	if ((_ret = (_x)) != CASS_OK) {\
 		ERROR("Error setting " _opt ": %s", cass_error_desc(_ret));\
-		return RLM_SQL_ERROR;\
+		return -1;\
 	}\
 } while (0)
 
@@ -687,7 +687,7 @@ do {\
 
 	DEBUG4("Configuring CassCluster structure");
 	cluster = inst->cluster = cass_cluster_new();
-	if (!cluster) return RLM_SQL_ERROR;
+	if (!cluster) return -1;
 
 	/*
 	 *	Parameters inherited from the top level SQL module config
@@ -774,7 +774,7 @@ do {\
 		CassSsl	*ssl;
 
 		ssl = inst->ssl = cass_ssl_new();
-		if (!ssl) return RLM_SQL_ERROR;
+		if (!ssl) return -1;
 
 		if (inst->tls_verify_cert_str) {
 			int	verify_cert;
@@ -807,7 +807,7 @@ do {\
 	}
 
 	inst->session = cass_session_new();
-	if (!inst->session) return RLM_SQL_ERROR;
+	if (!inst->session) return -1;
 
 	return 0;
 }