SQL "safe" is now done by pointers to the driver

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 1f33130b3c83c78f7fbe2996b4d21828a6c1291e..0c4627fd456ff51e835ae4b49f520f347432f84a 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
@@ -972,7 +972,6 @@ rlm_sql_driver_t rlm_sql_cassandra = {
                .instantiate                    = mod_instantiate,
                .detach                         = mod_detach
        },
-       .number                         = 7,
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_query,

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 fce6190b02baa14b7030a24ef7f7c3ff89c22d28..c5362eaa6604d18f1cf1fc4af807be4f860e2d64 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
@@ -291,7 +291,6 @@ rlm_sql_driver_t rlm_sql_db2 = {
                .magic                          = MODULE_MAGIC_INIT,
                .name                           = "sql_db2",
        },
-       .number                         = 8,
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,

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 dcc25145d12f04e9a648369d753979427c685532..946ec28e932cdaa9ffa1c4606d458330a873639f 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
@@ -297,7 +297,6 @@ rlm_sql_driver_t rlm_sql_firebird = {
                .name                           = "sql_firebird",
                .magic                          = MODULE_MAGIC_INIT
        },
-       .number                         = 9,
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,

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 79bb8e20596127214fdbefce24aed84675523aef..085c75e3c799f3cdbc63044fac6156b953b296bb 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
@@ -819,7 +819,6 @@ rlm_sql_driver_t rlm_sql_freetds = {
                .magic                          = MODULE_MAGIC_INIT,
                .name                           = "sql_freetds"
        },
-       .number                         = 10,
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,

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 2fd5ea75f75c2f1a3efca00c3c281b206d652970..f0c744683b32c64e04787aa026df2abe6d05d7ae 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
@@ -781,7 +781,6 @@ rlm_sql_driver_t rlm_sql_mysql = {
                .bootstrap                      = mod_bootstrap
        },
        .flags                          = RLM_SQL_RCODE_FLAGS_ALT_QUERY,
-       .number                         = 3,
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,

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 dcaa4bffaf6e32a3c99cc7b5754ded24bc503665..b4f4e43a049f69eb1918c5e0c980cdcc5754860a 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
@@ -102,7 +102,6 @@ rlm_sql_driver_t rlm_sql_null = {
                .magic                          = MODULE_MAGIC_INIT,
                .name                           = "sql_null"
        },
-       .number                         = 1,
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,

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 dbc618f877e16611086a524dd4e31b384e55c655..13b3f8b2b77a75478d3015afa7b896f45ac8ed2f 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
@@ -633,7 +633,6 @@ rlm_sql_driver_t rlm_sql_oracle = {
                .bootstrap                      = mod_bootstrap,
                .detach                         = mod_detach
        },
-       .number                         = 5,
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,

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 9bfc51623bb9f7f21f7093a4b11de6ad19c619c8..40612d83b3222d1ca48fb005532e3296fa7eae8e 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
@@ -678,7 +678,6 @@ rlm_sql_driver_t rlm_sql_postgresql = {
                .bootstrap                      = mod_bootstrap
        },
        .flags                          = RLM_SQL_RCODE_FLAGS_ALT_QUERY,
-       .number                         = 2,
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,

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 3b5f663a6a4ed2ef31d270091af385da3a30a770..3ca6339988a47da6bc299f98e9be8f0e8f3d0237 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
@@ -821,7 +821,6 @@ rlm_sql_driver_t rlm_sql_sqlite = {
                .bootstrap                      = mod_bootstrap
        },
        .flags                          = RLM_SQL_RCODE_FLAGS_ALT_QUERY,
-       .number                         = 4,
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,

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 30ed97d6a3aa220bd7203269ba3b959a41e38592..2bbaca58ac3b18eed66e25e347b283e4a1b7fea2 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
@@ -393,7 +393,6 @@ rlm_sql_driver_t rlm_sql_unixodbc = {
                .magic                          = MODULE_MAGIC_INIT,
                .name                           = "sql_unixodbc"
        },
-       .number                         = 6,
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_query,
        .sql_select_query               = sql_select_query,

diff --git a/src/modules/rlm_sql/rlm_sql.h b/src/modules/rlm_sql/rlm_sql.h
index e8d0a575fae4fabdeacb133ba7892fec823cf7ae..fa41f336e7aebc4655ba6f5d27606ce568298d43 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.h
+++ b/src/modules/rlm_sql/rlm_sql.h
@@ -149,8 +149,6 @@ typedef struct {
 
        int             flags;
 
-       int             number;                         //! for safe operations
-
        sql_rcode_t     (*sql_socket_init)(rlm_sql_handle_t *handle, rlm_sql_config_t const *config,
                                           fr_time_delta_t timeout);