From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 3 Mar 2022 03:31:35 +0000 (-0600)
Subject: Fix build errors in cassandra
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a0f03384ef9b178d94a2f1d929865a5849542e1;p=thirdparty%2Ffreeradius-server.git

Fix build errors in cassandra
---

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 b9b74fca6de..88b7a190069 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
@@ -436,14 +436,15 @@ static sql_rcode_t sql_query(rlm_sql_handle_t *handle, rlm_sql_config_t const *c
 {
 	rlm_sql_cassandra_conn_t	*conn = handle->conn;
 	rlm_sql_cassandra_t		*inst = talloc_get_type_abort(handle->inst->driver_submodule->dl_inst->data, rlm_sql_cassandra_t);
+
 	CassStatement			*statement;
 	CassFuture			*future;
 	CassError			ret;
 
 	statement = cass_statement_new_n(query, talloc_array_length(query) - 1, 0);
-	if (conf->consistency_str) cass_statement_set_consistency(statement, conf->consistency);
+	if (inst->consistency_str) cass_statement_set_consistency(statement, inst->consistency);
 
-	future = cass_session_execute(conf->session, statement);
+	future = cass_session_execute(inst->session, statement);
 	cass_statement_free(statement);
 
 	ret = cass_future_error_code(future);
@@ -960,14 +961,16 @@ static int mod_load(void)
 /* Exported to rlm_sql */
 extern rlm_sql_driver_t rlm_sql_cassandra;
 rlm_sql_driver_t rlm_sql_cassandra = {
-	.name				= "rlm_sql_cassandra",
-	.magic				= RLM_MODULE_INIT,
-	.inst_size			= sizeof(rlm_sql_cassandra_t),
-	.onload				= mod_load,
-	.unload				= mod_unload,
-	.config				= driver_config,
-	.instantiate			= mod_instantiate,
-	.detach				= mod_detach,
+	.common = {
+		.name				= "rlm_sql_cassandra",
+		.magic				= MODULE_MAGIC_INIT,
+		.inst_size			= sizeof(rlm_sql_cassandra_t),
+		.onload				= mod_load,
+		.unload				= mod_unload,
+		.config				= driver_config,
+		.instantiate			= mod_instantiate,
+		.detach				= mod_detach
+	},
 	.sql_socket_init		= sql_socket_init,
 	.sql_query			= sql_query,
 	.sql_select_query		= sql_query,
diff --git a/src/modules/rlm_sql/rlm_sql.h b/src/modules/rlm_sql/rlm_sql.h
index a7379e70892..cb2c77386d4 100644
--- a/src/modules/rlm_sql/rlm_sql.h
+++ b/src/modules/rlm_sql/rlm_sql.h
@@ -184,7 +184,6 @@ typedef struct {
 
 	int		flags;
 
-	sql_rcode_t (*instantiate)(rlm_sql_config_t const *config, void *instance, CONF_SECTION *cs);
 	sql_rcode_t (*sql_socket_init)(rlm_sql_handle_t *handle, rlm_sql_config_t const *config,
 				       fr_time_delta_t timeout);