From: Arran Cudbard-Bell Date: Thu, 7 Mar 2013 19:46:38 +0000 (-0500) Subject: Rename sql_init_socket to sql_socket_init X-Git-Tag: release_3_0_0_beta1~800 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7813703bd2607d9254309defd379d13e91c42e81;p=thirdparty%2Ffreeradius-server.git Rename sql_init_socket to sql_socket_init --- 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 21fe7bd7a6a..2eed0844017 100644 --- 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 @@ -52,7 +52,7 @@ typedef struct rlm_sql_db2_sock { * Purpose: Establish connection to the db * *************************************************************************/ -static int sql_init_socket(rlm_sql_handle_t *handle, rlm_sql_config_t *config) +static int sql_socket_init(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { SQLRETURN retval; rlm_sql_db2_sock *sock; @@ -341,7 +341,7 @@ not_implemented(UNUSED rlm_sql_handle_t * handle, UNUSED rlm_sql_config_t *confi rlm_sql_module_t rlm_sql_db2 = { "rlm_sql_db2", NULL, - sql_init_socket, + sql_socket_init, sql_destroy_socket, /* sql_destroy_socket*/ sql_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 06fdcf66ad4..b9aae14d1ea 100644 --- 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 @@ -35,7 +35,7 @@ static int sql_finish_query(rlm_sql_handle_t *handle, rlm_sql_config_t *config); /** Establish connection to the db * */ -static int sql_init_socket(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { +static int sql_socket_init(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { rlm_sql_firebird_sock *firebird_sock; long res; @@ -277,7 +277,7 @@ static int sql_affected_rows(rlm_sql_handle_t *handle, rlm_sql_config_t *config) rlm_sql_module_t rlm_sql_firebird = { "rlm_sql_firebird", NULL, - sql_init_socket, + sql_socket_init, sql_destroy_socket, sql_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 7ae4163fee9..6e8593b5a4c 100644 --- 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 @@ -66,7 +66,7 @@ static int err_handler(UNUSED DBPROCESS *dbproc, UNUSED int severity, UNUSED int * Purpose: Establish connection to the db * *************************************************************************/ -static int sql_init_socket(rlm_sql_handle_t *handle, rlm_sql_config_t *config) +static int sql_socket_init(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { LOGINREC *login; rlm_sql_freetds_sock *freetds_sock; @@ -344,7 +344,7 @@ static int sql_affected_rows(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t * rlm_sql_module_t rlm_sql_freetds = { "rlm_sql_freetds", NULL, - sql_init_socket, + sql_socket_init, sql_destroy_socket, sql_query, sql_select_query, 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 a73167105a3..966c47513bb 100644 --- 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 @@ -51,12 +51,12 @@ static int sql_num_fields(rlm_sql_handle_t *handle, rlm_sql_config_t *config); /************************************************************************* * - * Function: sql_init_socket + * Function: sql_socket_init * * Purpose: Establish connection to the db * *************************************************************************/ -static int sql_init_socket(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { +static int sql_socket_init(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { rlm_sql_iodbc_sock *iodbc_sock; SQLRETURN rcode; @@ -396,7 +396,7 @@ static int sql_affected_rows(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t * rlm_sql_module_t rlm_sql_iodbc = { "rlm_sql_iodbc", NULL, - sql_init_socket, + sql_socket_init, sql_destroy_socket, sql_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 98bc069a1f8..fe68fccd34e 100644 --- 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 @@ -62,7 +62,7 @@ static int sql_free_result(rlm_sql_handle_t*, rlm_sql_config_t*); * Purpose: Establish connection to the db * *************************************************************************/ -static int sql_init_socket(rlm_sql_handle_t *handle, rlm_sql_config_t *config) +static int sql_socket_init(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { rlm_sql_mysql_sock *mysql_sock; unsigned long sql_flags; @@ -518,7 +518,7 @@ static int sql_affected_rows(rlm_sql_handle_t * handle, UNUSED rlm_sql_config_t rlm_sql_module_t rlm_sql_mysql = { "rlm_sql_mysql", NULL, - sql_init_socket, + sql_socket_init, sql_destroy_socket, sql_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 cc0cb35d341..647e853d80f 100644 --- 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 @@ -40,7 +40,7 @@ static const void *fake = "fake"; * Purpose: Establish connection to the db * *************************************************************************/ -static int sql_init_socket(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *config) +static int sql_socket_init(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *config) { memcpy(&handle->conn, &fake, sizeof(handle->conn)); return 0; @@ -236,7 +236,7 @@ static int sql_affected_rows(UNUSED rlm_sql_handle_t * handle, UNUSED rlm_sql_co rlm_sql_module_t rlm_sql_null = { "rlm_sql_null", NULL, - sql_init_socket, + sql_socket_init, sql_destroy_socket, sql_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 5001cef447a..5434e0903a9 100644 --- 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 @@ -128,12 +128,12 @@ static int sql_close(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { /************************************************************************* * - * Function: sql_init_socket + * Function: sql_socket_init * * Purpose: Establish connection to the db * *************************************************************************/ -static int sql_init_socket(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { +static int sql_socket_init(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { rlm_sql_oracle_sock *oracle_sock; @@ -624,7 +624,7 @@ static int sql_affected_rows(rlm_sql_handle_t *handle, rlm_sql_config_t *config) rlm_sql_module_t rlm_sql_oracle = { "rlm_sql_oracle", NULL, - sql_init_socket, + sql_socket_init, sql_destroy_socket, sql_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 72df9096d0e..f4ba9ac23c0 100644 --- 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 @@ -141,7 +141,7 @@ static int check_fatal_error (char *errorcode) * Purpose: Establish connection to the db * *************************************************************************/ -static int sql_init_socket(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { +static int sql_socket_init(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { char connstring[2048]; const char *port, *host; rlm_sql_postgres_sock *pg_sock; @@ -527,7 +527,7 @@ not_implemented(UNUSED rlm_sql_handle_t * handle, UNUSED rlm_sql_config_t *confi rlm_sql_module_t rlm_sql_postgresql = { "rlm_sql_postgresql", NULL, - sql_init_socket, + sql_socket_init, sql_destroy_socket, sql_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 a29b613a31d..7ff0cc19c19 100644 --- 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 @@ -324,7 +324,7 @@ static int sql_destroy_socket(rlm_sql_handle_t *handle, return 0; } -static int sql_init_socket(rlm_sql_handle_t *handle, rlm_sql_config_t *config) +static int sql_socket_init(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { rlm_sql_conn_t *conn; rlm_sql_sqlite_config_t *driver = config->driver; @@ -587,7 +587,7 @@ static int sql_affected_rows(rlm_sql_handle_t *handle, rlm_sql_module_t rlm_sql_sqlite = { "rlm_sql_sqlite", sql_instantiate, - sql_init_socket, + sql_socket_init, sql_destroy_socket, sql_query, sql_select_query, diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sybase/rlm_sql_sybase.c b/src/modules/rlm_sql/drivers/rlm_sql_sybase/rlm_sql_sybase.c index 282cf151479..bb8f25d7c70 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_sybase/rlm_sql_sybase.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_sybase/rlm_sql_sybase.c @@ -229,12 +229,12 @@ static const char *sql_error(UNUSED rlm_sql_handle_t *handle, UNUSED rlm_sql_con /************************************************************************* * - * Function: sql_init_socket + * Function: sql_socket_init * * Purpose: Establish connection to the db * *************************************************************************/ -static int sql_init_socket(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { +static int sql_socket_init(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { rlm_sql_sybase_sock *sybase_sock; @@ -254,14 +254,14 @@ static int sql_init_socket(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { the connection pooling design of rlm_sql, we'll have to go with one context per connection */ if (cs_ctx_alloc(CS_VERSION_100, &sybase_sock->context) != CS_SUCCEED) { - radlog(L_ERR,"rlm_sql_sybase(sql_init_socket): Unable to allocate CS context structure (cs_ctx_alloc())"); + radlog(L_ERR,"rlm_sql_sybase(sql_socket_init): Unable to allocate CS context structure (cs_ctx_alloc())"); return -1; } /* Initialize ctlib */ if (ct_init(sybase_sock->context, CS_VERSION_100) != CS_SUCCEED) { - radlog(L_ERR,"rlm_sql_sybase(sql_init_socket): Unable to initialize Client-Library (ct_init())"); + radlog(L_ERR,"rlm_sql_sybase(sql_socket_init): Unable to initialize Client-Library (ct_init())"); if (sybase_sock->context != (CS_CONTEXT *)NULL) { cs_ctx_drop(sybase_sock->context); } @@ -271,7 +271,7 @@ static int sql_init_socket(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { /* Install callback functions for error-handling */ if (cs_config(sybase_sock->context, CS_SET, CS_MESSAGE_CB, (CS_VOID *)csmsg_callback, CS_UNUSED, NULL) != CS_SUCCEED) { - radlog(L_ERR,"rlm_sql_sybase(sql_init_socket): Unable to install CS Library error callback"); + radlog(L_ERR,"rlm_sql_sybase(sql_socket_init): Unable to install CS Library error callback"); if (sybase_sock->context != (CS_CONTEXT *)NULL) { ct_exit(sybase_sock->context, CS_FORCE_EXIT); cs_ctx_drop(sybase_sock->context); @@ -280,7 +280,7 @@ static int sql_init_socket(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { } if (ct_callback(sybase_sock->context, NULL, CS_SET, CS_CLIENTMSG_CB, (CS_VOID *)clientmsg_callback) != CS_SUCCEED) { - radlog(L_ERR,"rlm_sql_sybase(sql_init_socket): Unable to install client message callback"); + radlog(L_ERR,"rlm_sql_sybase(sql_socket_init): Unable to install client message callback"); if (sybase_sock->context != (CS_CONTEXT *)NULL) { ct_exit(sybase_sock->context, CS_FORCE_EXIT); cs_ctx_drop(sybase_sock->context); @@ -289,7 +289,7 @@ static int sql_init_socket(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { } if (ct_callback(sybase_sock->context, NULL, CS_SET, CS_SERVERMSG_CB, (CS_VOID *)servermsg_callback) != CS_SUCCEED) { - radlog(L_ERR,"rlm_sql_sybase(sql_init_socket): Unable to install client message callback"); + radlog(L_ERR,"rlm_sql_sybase(sql_socket_init): Unable to install client message callback"); if (sybase_sock->context != (CS_CONTEXT *)NULL) { ct_exit(sybase_sock->context, CS_FORCE_EXIT); cs_ctx_drop(sybase_sock->context); @@ -300,7 +300,7 @@ static int sql_init_socket(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { /* Allocate a ctlib connection structure */ if (ct_con_alloc(sybase_sock->context, &sybase_sock->connection) != CS_SUCCEED) { - radlog(L_ERR,"rlm_sql_sybase(sql_init_socket): Unable to allocate connection structure (ct_con_alloc())"); + radlog(L_ERR,"rlm_sql_sybase(sql_socket_init): Unable to allocate connection structure (ct_con_alloc())"); if (sybase_sock->context != (CS_CONTEXT *)NULL) { ct_exit(sybase_sock->context, CS_FORCE_EXIT); cs_ctx_drop(sybase_sock->context); @@ -311,7 +311,7 @@ static int sql_init_socket(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { /* Initialize inline error handling for the connection */ /* if (ct_diag(sybase_sock->connection, CS_INIT, CS_UNUSED, CS_UNUSED, NULL) != CS_SUCCEED) { - radlog(L_ERR,"rlm_sql_sybase(sql_init_socket): Unable to initialize error handling (ct_diag())"); + radlog(L_ERR,"rlm_sql_sybase(sql_socket_init): Unable to initialize error handling (ct_diag())"); if (sybase_sock->context != (CS_CONTEXT *)NULL) { ct_exit(sybase_sock->context, CS_FORCE_EXIT); cs_ctx_drop(sybase_sock->context); @@ -325,7 +325,7 @@ static int sql_init_socket(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { if (ct_con_props(sybase_sock->connection, CS_SET, CS_USERNAME, config->sql_login, strlen(config->sql_login), NULL) != CS_SUCCEED) { - radlog(L_ERR,"rlm_sql_sybase(sql_init_socket): Unable to set username for connection (ct_con_props())\n%s", + radlog(L_ERR,"rlm_sql_sybase(sql_socket_init): Unable to set username for connection (ct_con_props())\n%s", sql_error(handle, config)); if (sybase_sock->context != (CS_CONTEXT *)NULL) { ct_exit(sybase_sock->context, CS_FORCE_EXIT); @@ -336,7 +336,7 @@ static int sql_init_socket(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { if (ct_con_props(sybase_sock->connection, CS_SET, CS_PASSWORD, config->sql_password, strlen(config->sql_password), NULL) != CS_SUCCEED) { - radlog(L_ERR,"rlm_sql_sybase(sql_init_socket): Unable to set password for connection (ct_con_props())\n%s", + radlog(L_ERR,"rlm_sql_sybase(sql_socket_init): Unable to set password for connection (ct_con_props())\n%s", sql_error(handle, config)); if (sybase_sock->context != (CS_CONTEXT *)NULL) { ct_exit(sybase_sock->context, CS_FORCE_EXIT); @@ -348,7 +348,7 @@ static int sql_init_socket(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { /* Establish the connection */ if (ct_connect(sybase_sock->connection, config->sql_server, strlen(config->sql_server)) != CS_SUCCEED) { - radlog(L_ERR,"rlm_sql_sybase(sql_init_socket): Unable to establish connection to symbolic servername %s\n%s", + radlog(L_ERR,"rlm_sql_sybase(sql_socket_init): Unable to establish connection to symbolic servername %s\n%s", config->sql_server, sql_error(handle, config)); if (sybase_sock->context != (CS_CONTEXT *)NULL) { ct_exit(sybase_sock->context, CS_FORCE_EXIT); @@ -905,7 +905,7 @@ static int sql_affected_rows(rlm_sql_handle_t *handle, rlm_sql_config_t *config) rlm_sql_module_t rlm_sql_sybase = { "rlm_sql_sybase", NULL, - sql_init_socket, + sql_socket_init, sql_destroy_socket, sql_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 93c47b69fcc..eb3962dbd7a 100644 --- 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 @@ -49,12 +49,12 @@ static int sql_num_fields(rlm_sql_handle_t *handle, rlm_sql_config_t *config); /************************************************************************* * - * Function: sql_init_socket + * Function: sql_socket_init * * Purpose: Establish connection to the db * *************************************************************************/ -static int sql_init_socket(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { +static int sql_socket_init(rlm_sql_handle_t *handle, rlm_sql_config_t *config) { rlm_sql_unixodbc_sock *unixodbc_sock; long err_handle; @@ -453,7 +453,7 @@ static int sql_affected_rows(rlm_sql_handle_t *handle, rlm_sql_config_t *config) rlm_sql_module_t rlm_sql_unixodbc = { "rlm_sql_unixodbc", NULL, - sql_init_socket, + sql_socket_init, sql_destroy_socket, sql_query, sql_select_query, diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c index e7d890c05b1..9b4d818c84f 100644 --- 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_init_socketpool(inst) < 0) return -1; + if (sql_socket_initpool(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 479d18aaf70..21ae9d6aff3 100644 --- a/src/modules/rlm_sql/rlm_sql.h +++ b/src/modules/rlm_sql/rlm_sql.h @@ -92,7 +92,7 @@ typedef struct rlm_sql_module_t { const char *name; int (*sql_instantiate)(CONF_SECTION *conf, rlm_sql_config_t *config); - int (*sql_init_socket)(rlm_sql_handle_t *handle, 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); @@ -133,7 +133,7 @@ typedef struct sql_grouplist { struct sql_grouplist *next; } rlm_sql_grouplist_t; -int sql_init_socketpool(rlm_sql_t *inst); +int sql_socket_initpool(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 13560250e15..02cc4366beb 100644 --- a/src/modules/rlm_sql/sql.c +++ b/src/modules/rlm_sql/sql.c @@ -75,7 +75,7 @@ static void *sql_conn_create(void *ctx) handle->inst = inst; talloc_set_destructor((void *) handle, sql_conn_destructor); - rcode = (inst->module->sql_init_socket)(handle, inst->config); + rcode = (inst->module->sql_socket_init)(handle, inst->config); if (rcode == 0) { exec_trigger(NULL, inst->cs, "modules.sql.open", FALSE); @@ -98,12 +98,12 @@ static int sql_conn_delete(UNUSED void *ctx, void *conn) /************************************************************************* * - * Function: sql_init_socketpool + * Function: sql_socket_initpool * * Purpose: Connect to the sql server, if possible * *************************************************************************/ -int sql_init_socketpool(rlm_sql_t * inst) +int sql_socket_initpool(rlm_sql_t * inst) { inst->pool = fr_connection_pool_init(inst->cs, inst, sql_conn_create,