Only MySQL uses sql_store_result

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 dee3d16d665e6a07fea1f01d2b39af19cc56c598..d04601a958f4348e13102ee4186991f759256324 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
@@ -168,14 +168,6 @@ static sql_rcode_t sql_select_query(rlm_sql_handle_t *handle, rlm_sql_config_t *
        return sql_query(handle, config, query);
 }
 
-/** Returns a result set for the query.
- *
- */
-static sql_rcode_t sql_store_result(UNUSED rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *config)
-{
-       return 0;
-}
-
 /** Returns number of columns from query.
  *
  */
@@ -318,7 +310,6 @@ rlm_sql_module_t rlm_sql_firebird = {
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,
-       .sql_store_result               = sql_store_result,
        .sql_num_fields                 = sql_num_fields,
        .sql_num_rows                   = sql_num_rows,
        .sql_affected_rows              = sql_affected_rows,

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 b90ad6694c1f0b038301a0cc79cc71e0706bd545..744180757d643f67a986212e30cc6a559f5f78c8 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
@@ -497,14 +497,6 @@ static sql_rcode_t sql_select_query(rlm_sql_handle_t *handle, rlm_sql_config_t *
        return RLM_SQL_OK;
 }
 
-static sql_rcode_t sql_store_result(UNUSED rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *config)
-{
-       /*
-        *      Not needed for freetds, code that may have gone here iS in sql_select_query and sql_fetch_row
-        */
-       return RLM_SQL_OK;
-}
-
 static int sql_num_rows(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *config)
 {
        rlm_sql_freetds_conn_t *conn = handle->conn;
@@ -758,7 +750,6 @@ rlm_sql_module_t rlm_sql_freetds = {
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,
-       .sql_store_result               = sql_store_result,
        .sql_num_fields                 = sql_num_fields,
        .sql_num_rows                   = sql_num_rows,
        .sql_affected_rows              = sql_affected_rows,

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/rlm_sql_iodbc.c b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/rlm_sql_iodbc.c
index e96c0e265118eaeec1679f29cd6e198737d66f3a..61d20868e57225ae516fd7a926c73258851f11f4 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/rlm_sql_iodbc.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/rlm_sql_iodbc.c
@@ -188,11 +188,6 @@ static sql_rcode_t sql_select_query(rlm_sql_handle_t *handle, rlm_sql_config_t *
        return 0;
 }
 
-static sql_rcode_t sql_store_result(UNUSED rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *config)
-{
-       return 0;
-}
-
 static int sql_num_fields(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *config)
 {
 
@@ -331,7 +326,6 @@ rlm_sql_module_t rlm_sql_iodbc = {
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,
-       .sql_store_result               = sql_store_result,
        .sql_num_fields                 = sql_num_fields,
        .sql_affected_rows              = sql_affected_rows,
        .sql_fields                     = sql_fields,

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 5516c227008b0204e7f7d75387e26558469aafee..1a2dce18a650d382270e8850b9b271d7c61d3678 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
@@ -44,11 +44,6 @@ static sql_rcode_t sql_query(UNUSED rlm_sql_handle_t * handle,
        return 0;
 }
 
-static sql_rcode_t sql_store_result(UNUSED rlm_sql_handle_t * handle, UNUSED rlm_sql_config_t *config)
-{
-       return 0;
-}
-
 static int sql_num_fields(UNUSED rlm_sql_handle_t * handle, UNUSED rlm_sql_config_t *config)
 {
        return 0;
@@ -108,7 +103,6 @@ rlm_sql_module_t rlm_sql_null = {
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,
-       .sql_store_result               = sql_store_result,
        .sql_num_fields                 = sql_num_fields,
        .sql_num_rows                   = sql_num_rows,
        .sql_fetch_row                  = sql_fetch_row,

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 8da69e8aaff8577dc269577712be96aae262decd..9470c5b83338da8d0db2a6556e790c0fe3fd64f0 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
@@ -424,12 +424,6 @@ static sql_rcode_t sql_select_query(rlm_sql_handle_t *handle, rlm_sql_config_t *
        return RLM_SQL_ERROR;
 }
 
-static sql_rcode_t sql_store_result(UNUSED rlm_sql_handle_t *handle,UNUSED rlm_sql_config_t *config)
-{
-       /* Not needed for Oracle */
-       return 0;
-}
-
 static int sql_num_rows(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *config)
 {
        rlm_sql_oracle_conn_t *conn = handle->conn;
@@ -511,7 +505,6 @@ rlm_sql_module_t rlm_sql_oracle = {
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,
-       .sql_store_result               = sql_store_result,
        .sql_num_fields                 = sql_num_fields,
        .sql_num_rows                   = sql_num_rows,
        .sql_affected_rows              = sql_affected_rows,

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 d8ff1d07012df9ff34460c53e77b166ac9c3a332..3cf37dc3f630f364e64030e69a3c5e196aeda2d8 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
@@ -479,11 +479,6 @@ static sql_rcode_t sql_query(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *
        return sql_check_error(conn->db);
 }
 
-static sql_rcode_t sql_store_result(UNUSED rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *config)
-{
-       return 0;
-}
-
 static int sql_num_fields(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *config)
 {
        rlm_sql_sqlite_conn_t *conn = handle->conn;
@@ -577,29 +572,27 @@ static sql_rcode_t sql_fetch_row(rlm_sql_handle_t *handle, rlm_sql_config_t *con
                        break;
 
                case SQLITE_TEXT:
-                       {
-                               char const *p;
-                               p = (char const *) sqlite3_column_text(conn->statement, i);
+               {
+                       char const *p;
+                       p = (char const *) sqlite3_column_text(conn->statement, i);
 
-                               if (p) {
-                                       MEM(row[i] = talloc_typed_strdup(row, p));
-                               }
-                       }
+                       if (p) MEM(row[i] = talloc_typed_strdup(row, p));
+               }
                        break;
 
                case SQLITE_BLOB:
-                       {
-                               uint8_t const *p;
-                               size_t len;
+               {
+                       uint8_t const *p;
+                       size_t len;
 
-                               p = sqlite3_column_blob(conn->statement, i);
-                               if (p) {
-                                       len = sqlite3_column_bytes(conn->statement, i);
+                       p = sqlite3_column_blob(conn->statement, i);
+                       if (p) {
+                               len = sqlite3_column_bytes(conn->statement, i);
 
-                                       MEM(row[i] = talloc_zero_array(row, char, len + 1));
-                                       memcpy(row[i], p, len);
-                               }
+                               MEM(row[i] = talloc_zero_array(row, char, len + 1));
+                               memcpy(row[i], p, len);
                        }
+               }
                        break;
 
                default:
@@ -687,7 +680,6 @@ rlm_sql_module_t rlm_sql_sqlite = {
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,
-       .sql_store_result               = sql_store_result,
        .sql_num_fields                 = sql_num_fields,
        .sql_num_rows                   = sql_num_rows,
        .sql_affected_rows              = sql_affected_rows,

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 9340e505abc3f1de22013d0c593b223ae3b62eb1..7d311b1bff991aa596e3c66a0cae5ffc2eb704d6 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
@@ -176,12 +176,6 @@ static sql_rcode_t sql_select_query(rlm_sql_handle_t *handle, rlm_sql_config_t *
        return RLM_SQL_OK;
 }
 
-static sql_rcode_t sql_store_result(UNUSED rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *config)
-{
-       /* Not used */
-       return 0;
-}
-
 static int sql_num_fields(rlm_sql_handle_t *handle, rlm_sql_config_t *config)
 {
        rlm_sql_unixodbc_conn_t *conn = handle->conn;
@@ -406,7 +400,6 @@ rlm_sql_module_t rlm_sql_unixodbc = {
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,
-       .sql_store_result               = sql_store_result,
        .sql_num_fields                 = sql_num_fields,
        .sql_affected_rows              = sql_affected_rows,
        .sql_fields                     = sql_fields,

diff --git a/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c b/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c
index 27cfbe97ca76a9af7caa9479511fa53fa77cebe6..7179c3506e95bdefa467ec9b5449421cb3c3e5b6 100644 (file)
--- a/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c
+++ b/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c
@@ -155,7 +155,7 @@ static int nvp_select(unsigned int line, rlm_sqlhpwippool_t *data,
        }
        va_end(ap);
 
-       if ((data->db->sql_store_result)(sqlsock, data->sql_inst->config)) {
+       if (data->db->sql_store_result && (data->db->sql_store_result)(sqlsock, data->sql_inst->config)) {
                nvp_log(__LINE__, data, L_ERR,
                        "nvp_select(): error while saving results of query from line %u",
                        line);