From: Arran Cudbard-Bell Date: Tue, 17 Jul 2012 19:55:21 +0000 (+0100) Subject: Minor fixes and reformatting to keep VT100 and Emacs users happy X-Git-Tag: release_3_0_0_beta0~127^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de512238228706b9c35329a668f0f431291c6c2c;p=thirdparty%2Ffreeradius-server.git Minor fixes and reformatting to keep VT100 and Emacs users happy --- diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c index 70fa24f7bc4..fafe4e8f9f6 100644 --- a/src/modules/rlm_sql/rlm_sql.c +++ b/src/modules/rlm_sql/rlm_sql.c @@ -1,3 +1,4 @@ + /* * rlm_sql.c SQL Module * Main SQL module file. Most ICRADIUS code is located in sql.c @@ -1193,9 +1194,11 @@ static int rlm_sql_accounting(void *instance, REQUEST * request) { * associated with it. */ radius_xlat(logstr, sizeof(logstr), "Bulk closing sessions using 'accounting_onoff_query' - [nas '%{NAS-IP-Address}']", request, NULL); - radlog_request(L_ERR, 0, request, "%s", logstr); + radlog_request(L_DBG, 0, request, "%s", logstr); - radius_xlat(querystr, sizeof(querystr), inst->config->accounting_onoff_query, request, sql_escape_func); + radius_xlat(querystr, sizeof(querystr), + inst->config->accounting_onoff_query, request, + sql_escape_func); if (!*querystr) goto null_query; @@ -1209,7 +1212,9 @@ static int rlm_sql_accounting(void *instance, REQUEST * request) { if (sql_ret) return RLM_MODULE_FAIL; - numaffected = (inst->module->sql_affected_rows)(sqlsocket, inst->config); + numaffected = (inst->module->sql_affected_rows)(sqlsocket, + inst->config); + radlog_request(L_DBG, 0, request, "Closed %i sessions", numaffected); if (numaffected < 1) ret = RLM_MODULE_NOOP; @@ -1228,7 +1233,9 @@ static int rlm_sql_accounting(void *instance, REQUEST * request) { case PW_STATUS_ALIVE: radlog_request(L_DBG, 0, request, "Updating session using 'accounting_update_query'"); - radius_xlat(querystr, sizeof(querystr), inst->config->accounting_update_query, request, sql_escape_func); + radius_xlat(querystr, sizeof(querystr), + inst->config->accounting_update_query, request, + sql_escape_func); if (!*querystr) goto null_query; @@ -1237,7 +1244,9 @@ static int rlm_sql_accounting(void *instance, REQUEST * request) { case PW_STATUS_START: radlog_request(L_DBG, 0, request, "Creating session using 'accounting_start_query'"); - radius_xlat(querystr, sizeof(querystr), inst->config->accounting_start_query, request, sql_escape_func); + radius_xlat(querystr, sizeof(querystr), + inst->config->accounting_start_query, request, + sql_escape_func); if (!*querystr) goto null_query; @@ -1246,7 +1255,9 @@ static int rlm_sql_accounting(void *instance, REQUEST * request) { case PW_STATUS_STOP: radlog_request(L_DBG, 0, request, "Closing session using 'accounting_stop_query'"); - radius_xlat(querystr, sizeof(querystr), inst->config->accounting_stop_query, request, sql_escape_func); + radius_xlat(querystr, sizeof(querystr), + inst->config->accounting_stop_query, request, + sql_escape_func); if (!*querystr) goto null_query; @@ -1279,7 +1290,8 @@ static int rlm_sql_accounting(void *instance, REQUEST * request) { * failed and its not a client or SQL syntax error. */ if (sql_ret == 0) { - numaffected = (inst->module->sql_affected_rows)(sqlsocket, inst->config); + numaffected = (inst->module->sql_affected_rows)(sqlsocket, + inst->config); if (numaffected > 0) goto cleanup; } @@ -1304,7 +1316,9 @@ static int rlm_sql_accounting(void *instance, REQUEST * request) { case PW_STATUS_ALIVE: radlog_request(L_DBG, 0, request, "Failed updating session, creating session using 'accounting_update_query_alt'"); - radius_xlat(querystr, sizeof(querystr), inst->config->accounting_update_query_alt, request, sql_escape_func); + radius_xlat(querystr, sizeof(querystr), + inst->config->accounting_update_query_alt, + request, sql_escape_func); if (!*querystr) goto null_query; @@ -1313,7 +1327,9 @@ static int rlm_sql_accounting(void *instance, REQUEST * request) { case PW_STATUS_START: radlog_request(L_DBG, 0, request, "Failed creating session, updating session using 'accounting_start_query_alt'"); - radius_xlat(querystr, sizeof(querystr), inst->config->accounting_start_query_alt, request, sql_escape_func); + radius_xlat(querystr, sizeof(querystr), + inst->config->accounting_start_query_alt, + request, sql_escape_func); if (!*querystr) goto null_query; @@ -1331,7 +1347,7 @@ static int rlm_sql_accounting(void *instance, REQUEST * request) { acctsessiontime = pair->vp_integer; if (acctsessiontime <= 0) { - radius_xlat(logstr, sizeof(logstr), "stop packet with zero session length. [user '%{User-Name}', nas '%{NAS-IP-Address}']", request, NULL); + radius_xlat(logstr, sizeof(logstr), "Stop packet with zero session length. [user '%{User-Name}', nas '%{NAS-IP-Address}']", request, NULL); radlog_request(L_DBG, 0, request, "%s", logstr); goto release; @@ -1340,7 +1356,9 @@ static int rlm_sql_accounting(void *instance, REQUEST * request) { radlog_request(L_DBG, 0, request, "Failed closing session, creating closed session using 'accounting_stop_query_alt'"); - radius_xlat(querystr, sizeof(querystr), inst->config->accounting_stop_query_alt, request, sql_escape_func); + radius_xlat(querystr, sizeof(querystr), + inst->config->accounting_stop_query_alt, + request, sql_escape_func); if (!*querystr) goto null_query; @@ -1414,7 +1432,8 @@ static int rlm_sql_checksimul(void *instance, REQUEST * request) { } if((request->username == NULL) || (request->username->length == 0)) { - radlog_request(L_ERR, 0, request, "Zero Length username not permitted\n"); + radlog_request(L_ERR, 0, request, + "Zero Length username not permitted\n"); return RLM_MODULE_INVALID; } diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c index 3829892ba5e..2934cb87440 100644 --- a/src/modules/rlm_sql/sql.c +++ b/src/modules/rlm_sql/sql.c @@ -301,8 +301,8 @@ int rlm_sql_query(SQLSOCK **sqlsocket, SQL_INST *inst, char *query) ret = (inst->module->sql_query)(*sqlsocket, inst->config, query); /* - * Run through all available sockets until we exhaust all existing sockets - * in the pool and fail to establish a *new* connection. + * Run through all available sockets until we exhaust all existing + * sockets in the pool and fail to establish a *new* connection. */ if (ret == SQL_DOWN) { sql_down: @@ -352,8 +352,8 @@ int rlm_sql_select_query(SQLSOCK **sqlsocket, SQL_INST *inst, char *query) ret = (inst->module->sql_select_query)(*sqlsocket, inst->config, query); /* - * Run through all available sockets until we exhaust all existing sockets - * in the pool and fail to establish a *new* connection. + * Run through all available sockets until we exhaust all existing + * sockets in the pool and fail to establish a *new* connection. */ if (ret == SQL_DOWN) { sql_down: