Cast data not inst in sql drivers

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 8bacaedceee80ec67cfb1e987197fee7665ff0dd..b9b74fca6de2b85b9982b81ad5e13c1d66a16af1 100644 (file)
--- 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
@@ -723,7 +723,7 @@ static int mod_instantiate(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;
-       rlm_sql_cassandra_t     *inst = talloc_get_type_abort(mctx->inst, rlm_sql_cassandra_t);
+       rlm_sql_cassandra_t     *inst = talloc_get_type_abort(mctx->inst->data, rlm_sql_cassandra_t);
        bool                    do_tls = false;
        bool                    do_latency_aware_routing = false;
        CassCluster             *cluster;

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c b/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
index 9e436edd709174b64a89d9c2546b3017271db959..4bbfded94514b7325e9585e1d7fec12d9f81c6d2 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
@@ -157,7 +157,7 @@ static int mod_instantiate(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;
-       rlm_sql_oracle_t        *inst = talloc_get_type_abort(mctx->inst, rlm_sql_oracle_t);
+       rlm_sql_oracle_t        *inst = talloc_get_type_abort(mctx->inst->data, rlm_sql_oracle_t);
        char                    errbuff[512];
        sb4                     errcode = 0;
        OraText                 *sql_password = NULL;

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
index 97c37c24f88df296e24ce60b78631b9b93b15841..95aeb368561a18d0bfcddc56007bc90c880aa799 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
@@ -548,7 +548,7 @@ static int mod_instantiate(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;
-       rlm_sql_postgresql_t    *inst = talloc_get_type_abort(mctx->inst, rlm_sql_postgresql_t);
+       rlm_sql_postgresql_t    *inst = talloc_get_type_abort(mctx->inst->data, rlm_sql_postgresql_t);
        char                    application_name[NAMEDATALEN];
        char                    *db_string;