no need to call it mod_instantiate()

everything else uses instantiate()

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 0aa219fd8686e07022c4c455f4c85c31f0e97021..15a31856579925e0f01414abb8922120bf97eb92 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
@@ -965,7 +965,7 @@ rlm_sql_driver_t rlm_sql_cassandra = {
        .onload                         = mod_load,
        .unload                         = mod_unload,
        .config                         = driver_config,
-       .mod_instantiate                = mod_instantiate,
+       .instantiate                    = mod_instantiate,
        .detach                         = mod_detach,
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_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 2d143c8bce2092d6cc49b51af0b4549ae67a863d..85ab15b45ece2d45549255c0ab4e03c62e3c675e 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
@@ -850,7 +850,7 @@ rlm_sql_driver_t rlm_sql_mysql = {
        .onload                         = mod_load,
        .unload                         = mod_unload,
        .config                         = driver_config,
-       .mod_instantiate                = mod_instantiate,
+       .instantiate                    = mod_instantiate,
        .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 84289ee29d10c403d3783605ad40827957ecb248..3256241167fc054e0a64654a528d6639827d6a97 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
@@ -614,7 +614,7 @@ rlm_sql_driver_t rlm_sql_oracle = {
        .magic                          = RLM_MODULE_INIT,
        .inst_size                      = sizeof(rlm_sql_oracle_t),
        .config                         = driver_config,
-       .mod_instantiate                = mod_instantiate,
+       .instantiate                    = mod_instantiate,
        .detach                         = mod_detach,
        .sql_socket_init                = sql_socket_init,
        .sql_query                      = sql_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 1eac7fb7193dbad9eea4864ce14d8ada7554fafd..f11843de8746a27807320a914013cf29d0a2c522 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
@@ -673,7 +673,7 @@ rlm_sql_driver_t rlm_sql_postgresql = {
        .inst_size                      = sizeof(rlm_sql_postgres_t),
        .onload                         = mod_load,
        .config                         = driver_config,
-       .mod_instantiate                = mod_instantiate,
+       .instantiate                    = mod_instantiate,
        .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 a1a43b96aea1e5979974b35108da3c5a2157f2e6..23f56f1612b5cc30c4511a83079315ed0b4ef933 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
@@ -818,7 +818,7 @@ rlm_sql_driver_t rlm_sql_sqlite = {
        .inst_size                      = sizeof(rlm_sql_sqlite_t),
        .config                         = driver_config,
        .onload                         = mod_load,
-       .mod_instantiate                = mod_instantiate,
+       .instantiate                    = mod_instantiate,
        .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.c b/src/modules/rlm_sql/rlm_sql.c
index e6c5e52adefa1ca2853168e609811769827bd784..1d8e6cf8e59236a5f04d497184cbe6cc28877f88 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -1074,9 +1074,9 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf)
        /*
         *      Call the driver's instantiate function (if set)
         */
-       if (inst->driver->mod_instantiate && (inst->driver->mod_instantiate(inst->config,
-                                                                           inst->driver_inst->data,
-                                                                           driver_cs)) < 0) {
+       if (inst->driver->instantiate && (inst->driver->instantiate(inst->config,
+                                                                   inst->driver_inst->data,
+                                                                   driver_cs)) < 0) {
        error:
                TALLOC_FREE(inst->driver_inst);
                return -1;

diff --git a/src/modules/rlm_sql/rlm_sql.h b/src/modules/rlm_sql/rlm_sql.h
index 9a6310e33242e79f9ecea33b6de420f0208beba7..af797856cb065819c02b0e205fe90bf51d56888a 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.h
+++ b/src/modules/rlm_sql/rlm_sql.h
@@ -189,7 +189,7 @@ typedef struct {
 
        int             flags;
 
-       sql_rcode_t (*mod_instantiate)(rlm_sql_config_t const *config, void *instance, CONF_SECTION *cs);
+       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 *config,
                                       fr_time_delta_t timeout);