Simplify sql_error_t

No driver uses the SQL module config when fetching error messages.

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 9a08ddcc7d610449b3c78ca70a60f75b8a6a72e2..d544f2fe79d4529d712097c97f868aa476ea3aa1 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
@@ -812,7 +812,7 @@ static sql_rcode_t sql_free_result(fr_sql_query_t *query_ctx, UNUSED rlm_sql_con
 }
 
 static size_t sql_error(UNUSED TALLOC_CTX *ctx, sql_log_entry_t out[], size_t outlen,
-                       fr_sql_query_t *query_ctx, UNUSED rlm_sql_config_t const *config)
+                       fr_sql_query_t *query_ctx)
 {
        cassandra_query_ctx_t   *cass_query_ctx = talloc_get_type_abort(query_ctx->uctx, cassandra_query_ctx_t);
 

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c b/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c
index b3bedf83d808b8df0bf3d7f1803888dc84b03f52..764a2673ebf83fe892945bd13125ad1fa7183b9d 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c
@@ -235,7 +235,7 @@ static sql_rcode_t sql_free_result(fr_sql_query_t *query_, UNUSED rlm_sql_config
  * @return number of errors written to the #sql_log_entry_t array.
  */
 static size_t sql_error(TALLOC_CTX *ctx, sql_log_entry_t out[], NDEBUG_UNUSED size_t outlen,
-                       fr_sql_query_t *query_ctx, UNUSED rlm_sql_config_t const *config)
+                       fr_sql_query_t *query_ctx)
 {
        char                    state[6];
        char                    errbuff[1024];

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c b/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c
index 8c64e005dd7e8cc67dc5bea91417ba9ea804990e..e2fa5d0137bfc8d8f571a64a7fdf58eb6f0f4847 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c
@@ -272,7 +272,7 @@ static sql_rcode_t sql_free_result(fr_sql_query_t *query_ctx, UNUSED rlm_sql_con
  * @return number of errors written to the #sql_log_entry_t array.
  */
 static size_t sql_error(UNUSED TALLOC_CTX *ctx, sql_log_entry_t out[], NDEBUG_UNUSED size_t outlen,
-                       fr_sql_query_t *query_ctx, UNUSED rlm_sql_config_t const *config)
+                       fr_sql_query_t *query_ctx)
 {
        rlm_sql_firebird_conn_t *conn = talloc_get_type_abort(query_ctx->tconn->conn->h, rlm_sql_firebird_conn_t);
 

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c b/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c
index 18e5f09ea7e8fa1b09862086551eb94adb92fe6c..6c52371f05fcdb3875a248e6ce463b08a4b53f64 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c
@@ -386,7 +386,7 @@ static sql_rcode_t sql_fields(char const **out[], fr_sql_query_t *query_ctx, UNU
  * @return number of errors written to the #sql_log_entry_t array.
  */
 static size_t sql_error(UNUSED TALLOC_CTX *ctx, sql_log_entry_t out[], NDEBUG_UNUSED size_t outlen,
-                       fr_sql_query_t *query_ctx, UNUSED rlm_sql_config_t const *config)
+                       fr_sql_query_t *query_ctx)
 {
        rlm_sql_freetds_conn_t  *conn = talloc_get_type_abort(query_ctx->tconn->conn->h, rlm_sql_freetds_conn_t);
 

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
index 20cb31f00b0ec4f9e0ee822a32f32b7e97a7bc60..3920a7af012a0bf141e30ff305369e4b7aaf7b6b 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
@@ -635,7 +635,7 @@ static sql_rcode_t sql_free_result(fr_sql_query_t *query_ctx, UNUSED rlm_sql_con
  *     - -1 on failure.
  */
 static size_t sql_warnings(TALLOC_CTX *ctx, sql_log_entry_t out[], size_t outlen,
-                          rlm_sql_mysql_conn_t *conn, UNUSED rlm_sql_config_t const *config)
+                          rlm_sql_mysql_conn_t *conn)
 {
        MYSQL_RES               *result;
        MYSQL_ROW               row;
@@ -699,7 +699,7 @@ static size_t sql_warnings(TALLOC_CTX *ctx, sql_log_entry_t out[], size_t outlen
  * @return number of errors written to the #sql_log_entry_t array.
  */
 static size_t sql_error(TALLOC_CTX *ctx, sql_log_entry_t out[], size_t outlen,
-                       fr_sql_query_t *query_ctx, rlm_sql_config_t const *config)
+                       fr_sql_query_t *query_ctx)
 {
        rlm_sql_mysql_t const   *inst = talloc_get_type_abort_const(query_ctx->inst->driver_submodule->data, rlm_sql_mysql_t);
        rlm_sql_mysql_conn_t    *conn;
@@ -746,7 +746,7 @@ static size_t sql_error(TALLOC_CTX *ctx, sql_log_entry_t out[], size_t outlen,
 
                FALL_THROUGH;
                case SERVER_WARNINGS_YES:
-                       ret = sql_warnings(ctx, out, outlen - 1, conn, config);
+                       ret = sql_warnings(ctx, out, outlen - 1, conn);
                        if (ret > 0) i += ret;
                        break;
 

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_null/rlm_sql_null.c b/src/modules/rlm_sql/drivers/rlm_sql_null/rlm_sql_null.c
index 48964db6eb017f519418e4fd6f5e316a3dcc5598..294145230162f1879a520bb897a1b9d7cdf075d5 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_null/rlm_sql_null.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_null/rlm_sql_null.c
@@ -65,7 +65,7 @@ static sql_rcode_t sql_free_result(UNUSED fr_sql_query_t *query_ctx, UNUSED rlm_
  *
  */
 static size_t sql_error(UNUSED TALLOC_CTX *ctx, UNUSED sql_log_entry_t out[], UNUSED size_t outlen,
-                       UNUSED fr_sql_query_t *query_ctx, UNUSED rlm_sql_config_t const *config)
+                       UNUSED fr_sql_query_t *query_ctx)
 {
        return 0;
 }

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 5cc7f39426e1f2ea823a86404cb6d5febc086eee..228652d3d84af6a1dcf5f897a7f1228ed7d38b8a 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
@@ -116,7 +116,7 @@ static int sql_snprint_error(char *out, size_t outlen, rlm_sql_oracle_conn_t *co
  * @return number of errors written to the #sql_log_entry_t array.
  */
 static size_t sql_error(TALLOC_CTX *ctx, sql_log_entry_t out[], NDEBUG_UNUSED size_t outlen,
-                       fr_sql_query_t *query_ctx, UNUSED rlm_sql_config_t const *config)
+                       fr_sql_query_t *query_ctx)
 {
        char errbuff[512];
        int ret;

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 7da0a064c85bd50ba926cd5b1b7168c362891648..4574f9fdf8d37e44ff50f906dbed432ddfb1656e 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
@@ -624,7 +624,7 @@ static sql_rcode_t sql_free_result(fr_sql_query_t *query_ctx, UNUSED rlm_sql_con
  * @return number of errors written to the #sql_log_entry_t array.
  */
 static size_t sql_error(TALLOC_CTX *ctx, sql_log_entry_t out[], size_t outlen,
-                       fr_sql_query_t *query_ctx, UNUSED rlm_sql_config_t const *config)
+                       fr_sql_query_t *query_ctx)
 {
        rlm_sql_postgres_conn_t *conn = talloc_get_type_abort(query_ctx->tconn->conn->h, rlm_sql_postgres_conn_t);
        char const              *p, *q;

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
index b6b2e4b1d821c23e137c52205c3c1e390813ef8e..51cd8ff821b7cf12459aa663f263f9b9039355c4 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
@@ -573,7 +573,7 @@ static sql_rcode_t sql_free_result(fr_sql_query_t *query_ctx, UNUSED rlm_sql_con
  * @return number of errors written to the #sql_log_entry_t array.
  */
 static size_t sql_error(UNUSED TALLOC_CTX *ctx, sql_log_entry_t out[], NDEBUG_UNUSED size_t outlen,
-                       fr_sql_query_t *query_ctx, UNUSED rlm_sql_config_t const *config)
+                       fr_sql_query_t *query_ctx)
 {
        rlm_sql_sqlite_conn_t *conn = talloc_get_type_abort(query_ctx->tconn->conn->h, rlm_sql_sqlite_conn_t);
        char const *error;

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c
index 4ee7ce311137f1294c1105c87126d266905ecb02..58c1a88c69245cb32a8a91bb416cf0dffaa62954 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c
@@ -652,7 +652,7 @@ static sql_rcode_t sql_finish_query(fr_sql_query_t *query_ctx, UNUSED rlm_sql_co
  * @return number of errors written to the #sql_log_entry_t array.
  */
 static size_t sql_error(TALLOC_CTX *ctx, sql_log_entry_t out[], NDEBUG_UNUSED size_t outlen,
-                       fr_sql_query_t *query_ctx, UNUSED rlm_sql_config_t const *config)
+                       fr_sql_query_t *query_ctx)
 {
        rlm_sql_unixodbc_conn_t *conn = query_ctx->tconn->conn->h;
        SQLCHAR                 state[256];

diff --git a/src/modules/rlm_sql/rlm_sql.h b/src/modules/rlm_sql/rlm_sql.h
index 67075370c0b4ddaf37f0fab3ef3d7cc4b81f13de..76d359c8268173a106db85087ae0b6395f143df8 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.h
+++ b/src/modules/rlm_sql/rlm_sql.h
@@ -193,8 +193,7 @@ extern size_t sql_rcode_table_len;
  *     0  - If no error messages are available.
  *     >0 - Number of log entries
  */
-typedef size_t (*sql_error_t)(TALLOC_CTX *ctx, sql_log_entry_t out[], size_t outlen, fr_sql_query_t *handle,
-                             rlm_sql_config_t const *config);
+typedef size_t (*sql_error_t)(TALLOC_CTX *ctx, sql_log_entry_t out[], size_t outlen, fr_sql_query_t *handle);
 
 typedef struct {
        rlm_sql_t const         *sql;

diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c
index 13b2dc6a21f7963cbdcd4f5ffd7923028b88f9df..14672d7aac77fb61ceeea1da4a20f359fa491199 100644 (file)
--- a/src/modules/rlm_sql/sql.c
+++ b/src/modules/rlm_sql/sql.c
@@ -356,7 +356,7 @@ void rlm_sql_print_error(rlm_sql_t const *inst, request_t *request, fr_sql_query
        size_t          num, i;
        TALLOC_CTX      *log_ctx = talloc_new(NULL);
 
-       num = (inst->driver->sql_error)(log_ctx, log, (NUM_ELEMENTS(log)), query_ctx, &inst->config);
+       num = (inst->driver->sql_error)(log_ctx, log, (NUM_ELEMENTS(log)), query_ctx);
        if (num == 0) {
                ROPTIONAL(RERROR, ERROR, "Unknown error");
                talloc_free(log_ctx);