Fix typos/weird function names

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 9b4d818c84f64effd59b6859e0b36ada22592ad8..da6e6e19ed98cebdeb5051e497e69a4b1265890c 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -970,7 +970,7 @@ static int rlm_sql_instantiate(CONF_SECTION *conf, void **instance)
        radlog(L_INFO, "rlm_sql (%s): Attempting to connect to database \"%s\"",
               inst->config->xlat_name, inst->config->sql_db);
               
-       if (sql_socket_initpool(inst) < 0) return -1;
+       if (sql_socket_pool_init(inst) < 0) return -1;
 
        if (inst->config->groupmemb_query && 
            inst->config->groupmemb_query[0]) {

diff --git a/src/modules/rlm_sql/rlm_sql.h b/src/modules/rlm_sql/rlm_sql.h
index 21ae9d6aff32291c6b455e8bb77784575a9ef7a4..482d0a140f36ef4349ecc685582d97169ae72406 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.h
+++ b/src/modules/rlm_sql/rlm_sql.h
@@ -93,7 +93,6 @@ typedef struct rlm_sql_module_t {
 
        int (*sql_instantiate)(CONF_SECTION *conf, rlm_sql_config_t *config);   
        int (*sql_socket_init)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);
-       int (*sql_destroy_socket)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);
        int (*sql_query)(rlm_sql_handle_t *handle, rlm_sql_config_t *config, char *query);
        int (*sql_select_query)(rlm_sql_handle_t *handle, rlm_sql_config_t *config, char *query);
        int (*sql_store_result)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);
@@ -102,7 +101,6 @@ typedef struct rlm_sql_module_t {
        int (*sql_fetch_row)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);
        int (*sql_free_result)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);
        const char *(*sql_error)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);
-       int (*sql_close)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);
        int (*sql_finish_query)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);
        int (*sql_finish_select_query)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);
        int (*sql_affected_rows)(rlm_sql_handle_t *handle, rlm_sql_config_t *config);
@@ -133,7 +131,7 @@ typedef struct sql_grouplist {
        struct sql_grouplist    *next;
 } rlm_sql_grouplist_t;
 
-int     sql_socket_initpool(rlm_sql_t *inst);
+int     sql_socket_pool_init(rlm_sql_t *inst);
 void    sql_poolfree(rlm_sql_t *inst);
 int     sql_close_socket(rlm_sql_t *inst, rlm_sql_handle_t *handle);
 rlm_sql_handle_t *sql_get_socket(rlm_sql_t *inst);

diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c
index 9a7e85e7c95cd6bda6e31e6d5ed446dd4acc5834..311774486a68dfd07d76944a2da22171aff374ab 100644 (file)
--- a/src/modules/rlm_sql/sql.c
+++ b/src/modules/rlm_sql/sql.c
@@ -48,16 +48,6 @@ static int sql_conn_destructor(void *conn)
        rad_assert(inst);
        
        exec_trigger(NULL, inst->cs, "modules.sql.close", FALSE);
-
-       if (inst->module->sql_close) {
-               if (handle->conn) {
-                       (inst->module->sql_close)(handle, inst->config);
-               }
-       }
-               
-       if (inst->module->sql_destroy_socket) {
-               (inst->module->sql_destroy_socket)(handle, inst->config);
-       }
        
        return 0;
 }
@@ -110,12 +100,12 @@ static int sql_conn_delete(UNUSED void *ctx, void *conn)
 
 /*************************************************************************
  *
- *     Function: sql_socket_initpool
+ *     Function: sql_socket_pool_init
  *
  *     Purpose: Connect to the sql server, if possible
  *
  *************************************************************************/
-int sql_socket_initpool(rlm_sql_t * inst)
+int sql_socket_pool_init(rlm_sql_t * inst)
 {
        inst->pool = fr_connection_pool_init(inst->cs, inst,
                                             sql_conn_create,