Normalized error messages

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c
index ad678b8..71cdb94 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c
@@ -56,14 +56,14 @@ static int sql_init_socket(SQLSOCK *sqlsocket, SQL_CONFIG *config) {
 
        mysql_sock = sqlsocket->conn;
 
-       radlog(L_INFO, "rlm_sql: Starting connect to MySQL server for #%d",
+       radlog(L_INFO, "rlm_sql_mysql: Starting connect to MySQL server for #%d",
                        sqlsocket->id);
 
        mysql_init(&(mysql_sock->conn));
        if (!(mysql_sock->sock = mysql_real_connect(&(mysql_sock->conn), config->sql_server, config->sql_login, config->sql_password,
                                                                                                        config->sql_db, 0, NULL, CLIENT_FOUND_ROWS))) {
-               radlog(L_ERR, "rlm_sql: Couldn't connect socket to MySQL server %s@%s:%s", config->sql_login, config->sql_server, config->sql_db);
-               radlog(L_ERR, "rlm_sql:  Mysql error '%s'", mysql_error(&mysql_sock->conn));
+               radlog(L_ERR, "rlm_sql_mysql: Couldn't connect socket to MySQL server %s@%s:%s", config->sql_login, config->sql_server, config->sql_db);
+               radlog(L_ERR, "rlm_sql_mysql: Mysql error '%s'", mysql_error(&mysql_sock->conn));
                mysql_sock->sock = NULL;
                return -1;
        }
@@ -103,9 +103,9 @@ static int sql_query(SQLSOCK * sqlsocket, SQL_CONFIG *config, char *querystr) {
        rlm_sql_mysql_sock *mysql_sock = sqlsocket->conn;
 
        if (config->sqltrace)
-               radlog(L_DBG,"query:  %s", querystr);
+               radlog(L_DBG,"rlm_sql_mysql: query:  %s", querystr);
        if (mysql_sock->sock == NULL) {
-               radlog(L_ERR, "Socket not connected");
+               radlog(L_ERR, "rlm_sql_mysql: Socket not connected");
                return SQL_DOWN;
        }
 
@@ -156,12 +156,12 @@ static int sql_store_result(SQLSOCK * sqlsocket, SQL_CONFIG *config) {
        rlm_sql_mysql_sock *mysql_sock = sqlsocket->conn;
 
        if (mysql_sock->sock == NULL) {
-               radlog(L_ERR, "Socket not connected");
+               radlog(L_ERR, "rlm_sql_mysql: Socket not connected");
                return SQL_DOWN;
        }
        if (!(mysql_sock->result = mysql_store_result(mysql_sock->sock))) {
-               radlog(L_ERR, "MYSQL Error: Cannot get result");
-               radlog(L_ERR, "MYSQL Error: %s", mysql_error(mysql_sock->sock));
+               radlog(L_ERR, "rlm_sql_mysql: MYSQL Error: Cannot get result");
+               radlog(L_ERR, "rlm_sql_mysql: MYSQL Error: %s", mysql_error(mysql_sock->sock));
                return sql_check_error(mysql_errno(mysql_sock->sock));
        }
        return 0;
@@ -187,8 +187,8 @@ static int sql_num_fields(SQLSOCK * sqlsocket, SQL_CONFIG *config) {
 #else
        if (!(num = mysql_num_fields(mysql_sock->sock))) {
 #endif
-               radlog(L_ERR, "MYSQL Error: No Fields");
-               radlog(L_ERR, "MYSQL error: %s", mysql_error(mysql_sock->sock));
+               radlog(L_ERR, "rlm_sql_mysql: MYSQL Error: No Fields");
+               radlog(L_ERR, "rlm_sql_mysql: MYSQL error: %s", mysql_error(mysql_sock->sock));
        }
        return num;
 }
@@ -247,7 +247,7 @@ static int sql_check_error(int error) {
        case CR_SERVER_GONE_ERROR:
        case CR_SERVER_LOST:
        case -1:
-               radlog(L_DBG, "MYSQL check_error: %d, returning SQL_DOWN", error);
+               radlog(L_DBG, "rlm_sql_mysql: MYSQL check_error: %d, returning SQL_DOWN", error);
                return SQL_DOWN;
                break;
        case 0:
@@ -257,7 +257,7 @@ static int sql_check_error(int error) {
        case CR_COMMANDS_OUT_OF_SYNC:
        case CR_UNKNOWN_ERROR:
        default:
-               radlog(L_DBG, "MYSQL check_error: %d received", error);
+               radlog(L_DBG, "rlm_sql_mysql: MYSQL check_error: %d received", error);
                return -1;
                break;
        }

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/sql_oracle.c b/src/modules/rlm_sql/drivers/rlm_sql_oracle/sql_oracle.c
index 991b608..87e0e36 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/sql_oracle.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/sql_oracle.c
@@ -76,14 +76,14 @@ static int sql_init_socket(SQLSOCK *sqlsocket, SQL_CONFIG *config) {
                (dvoid * (*)(dvoid *, dvoid *, size_t))0, 
                (void (*)(dvoid *, dvoid *)) 0,
                0, (dvoid **)0 )) {
-               radlog(L_ERR,"Init: Couldn't init Oracle OCI environment (OCIEnvCreate())");
+               radlog(L_ERR,"rlm_sql_oracle: Couldn't init Oracle OCI environment (OCIEnvCreate())");
                return -1;
        }
 
        if (OCIHandleAlloc((dvoid *) oracle_sock->env, (dvoid **) &oracle_sock->errHandle,
                (ub4) OCI_HTYPE_ERROR, (size_t) 0, (dvoid **) 0))
        {
-               radlog(L_ERR,"Init: Couldn't init Oracle ERROR handle (OCIHandleAlloc())");
+               radlog(L_ERR,"rlm_sql_oracle: Couldn't init Oracle ERROR handle (OCIHandleAlloc())");
                return -1;
        }
 
@@ -93,7 +93,7 @@ static int sql_init_socket(SQLSOCK *sqlsocket, SQL_CONFIG *config) {
            ||  OCIHandleAlloc((dvoid *)oracle_sock->env, (dvoid **) &oracle_sock->queryHandle,
                                (ub4)OCI_HTYPE_STMT, (CONST size_t) 0, (dvoid **) 0))
        {
-               radlog(L_ERR,"Init: Couldn't init Oracle query handles: %s",
+               radlog(L_ERR,"rlm_sql_oracle: Couldn't init Oracle query handles: %s",
                        sql_error(sqlsocket, config));
                return -1;
        }
@@ -104,7 +104,7 @@ static int sql_init_socket(SQLSOCK *sqlsocket, SQL_CONFIG *config) {
                        config->sql_password,  strlen(config->sql_password),
                        config->sql_db, strlen(config->sql_db)))
        {
-               radlog(L_ERR,"Init: Oracle logon failed: '%s'", sql_error(sqlsocket, config));
+               radlog(L_ERR,"rlm_sql_oracle: Oracle logon failed: '%s'", sql_error(sqlsocket, config));
                return -1;
        }
 
@@ -147,7 +147,7 @@ static int sql_num_fields(SQLSOCK *sqlsocket, SQL_CONFIG *config) {
                        (ub4 *) 0,
                        (ub4)OCI_ATTR_PARAM_COUNT,
                        oracle_sock->errHandle)) {
-               radlog(L_ERR,"sql_num_fields: error retrieving colun count: %s",
+               radlog(L_ERR,"rlm_sql_oracle: Error retrieving column count in sql_num_fields: %s",
                        sql_error(sqlsocket, config));
                return -1;
        }
@@ -177,7 +177,7 @@ static int sql_query(SQLSOCK *sqlsocket, SQL_CONFIG *config, char *querystr) {
        if (OCIStmtPrepare (oracle_sock->queryHandle, oracle_sock->errHandle,
                                querystr, strlen(querystr),
                                OCI_NTV_SYNTAX, OCI_DEFAULT))  {
-               radlog(L_ERR,"sql_query: prepare failed: %s",sql_error(sqlsocket, config));
+               radlog(L_ERR,"rlm_sql_oracle: prepare failed in sql_query: %s",sql_error(sqlsocket, config));
                return -1;
        }
 
@@ -224,14 +224,14 @@ static int sql_select_query(SQLSOCK *sqlsocket, SQL_CONFIG *config, char *querys
        if (config->sqltrace)
                DEBUG(querystr);
        if (oracle_sock->conn == NULL) {
-               radlog(L_ERR, "Socket not connected");
+               radlog(L_ERR, "rlm_sql_oracle: Socket not connected");
                return SQL_DOWN;
        }
 
        if (OCIStmtPrepare (oracle_sock->queryHandle, oracle_sock->errHandle,
                                querystr, strlen(querystr),
                                OCI_NTV_SYNTAX, OCI_DEFAULT))  {
-               radlog(L_ERR,"sql_select_query: prepare failed: %s",sql_error(sqlsocket, config));
+               radlog(L_ERR,"rlm_sql_oracle: prepare failed in sql_select_query: %s",sql_error(sqlsocket, config));
                return -1;
        }
 
@@ -275,7 +275,7 @@ static int sql_select_query(SQLSOCK *sqlsocket, SQL_CONFIG *config, char *querys
                                (dvoid **)&param,
                                (ub4) y);
                if (x != OCI_SUCCESS) {
-                       radlog(L_ERR,"sql_select_query: OCIParamGet() failed: %s",
+                       radlog(L_ERR,"rlm_sql_oracle: OCIParamGet() failed in sql_select_query: %s",
                                sql_error(sqlsocket, config));
                        return -1;
                }
@@ -284,7 +284,7 @@ static int sql_select_query(SQLSOCK *sqlsocket, SQL_CONFIG *config, char *querys
                           (dvoid*)&dtype, (ub4*)0, OCI_ATTR_DATA_TYPE,
                           oracle_sock->errHandle);
                if (x != OCI_SUCCESS) {
-                       radlog(L_ERR,"sql_select_query: OCIAttrGet() failed: %s",
+                       radlog(L_ERR,"rlm_sql_oracle: OCIAttrGet() failed in sql_select_query: %s",
                                sql_error(sqlsocket, config));
                        return -1;
                }
@@ -303,7 +303,7 @@ static int sql_select_query(SQLSOCK *sqlsocket, SQL_CONFIG *config, char *querys
                                   (dvoid*) &dsize, (ub4 *)0, (ub4) OCI_ATTR_DATA_SIZE,
                                   oracle_sock->errHandle);
                        if (x != OCI_SUCCESS) {
-                               radlog(L_ERR,"sql_select_query: OCIAttrGet() failed: %s",
+                               radlog(L_ERR,"rlm_sql_oracle: OCIAttrGet() failed in sql_select_query: %s",
                                        sql_error(sqlsocket, config));
                                return -1;
                        }
@@ -337,7 +337,7 @@ static int sql_select_query(SQLSOCK *sqlsocket, SQL_CONFIG *config, char *querys
                                (dvoid *) 0,
                                OCI_DEFAULT);
                if (x != OCI_SUCCESS) {
-                       radlog(L_ERR,"sql_select_query: OCIDefineByPos() failed: %s",
+                       radlog(L_ERR,"rlm_sql_oracle: OCIDefineByPos() failed in sql_select_query: %s",
                                sql_error(sqlsocket, config));
                        return -1;
                }
@@ -404,7 +404,7 @@ static int sql_fetch_row(SQLSOCK *sqlsocket, SQL_CONFIG *config) {
        rlm_sql_oracle_sock *oracle_sock = sqlsocket->conn;
 
        if (oracle_sock->conn == NULL) {
-               radlog(L_ERR, "Socket not connected");
+               radlog(L_ERR, "rlm_sql_oracle: Socket not connected");
                return SQL_DOWN;
        }
 
@@ -420,7 +420,7 @@ static int sql_fetch_row(SQLSOCK *sqlsocket, SQL_CONFIG *config) {
        }
        else if (x != OCI_SUCCESS) {
                /* XXX Check if x suggests we should return SQL_DOWN */
-               radlog(L_ERR,"sql_fetch_row: fetch failed: %s",
+               radlog(L_ERR,"rlm_sql_oracle: fetch failed in sql_fetch_row: %s",
                                sql_error(sqlsocket, config));
                return SQL_DOWN;
        }

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c
index 7338ee4..fed9327 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c
@@ -133,8 +133,8 @@ static int sql_init_socket(SQLSOCK *sqlsocket, SQL_CONFIG *config) {
        pg_sock->conn=PQconnectdb(connstring);
 
        if (PQstatus(sqlsocket->conn) == CONNECTION_BAD) {
-               radlog(L_ERR, "sql_postgresql: Couldn't connect socket to PostgreSQL server %s@%s:%s", config->sql_login, config->sql_server, config->sql_db);
-               radlog(L_ERR, "sql_postgresql: Postgresql error '%s'", PQerrorMessage(pg_sock->conn));
+               radlog(L_ERR, "rlm_sql_postgresql: Couldn't connect socket to PostgreSQL server %s@%s:%s", config->sql_login, config->sql_server, config->sql_db);
+               radlog(L_ERR, "rlm_sql_postgresql: Postgresql error '%s'", PQerrorMessage(pg_sock->conn));
                PQfinish(pg_sock->conn);
                return -1;
        }
@@ -154,25 +154,25 @@ static int sql_query(SQLSOCK * sqlsocket, SQL_CONFIG *config, char *querystr) {
        rlm_sql_postgres_sock *pg_sock = sqlsocket->conn;
 
        if (config->sqltrace)
-               radlog(L_DBG,"query:\n%s", querystr);
+               radlog(L_DBG,"rlm_sql_postgresql: query:\n%s", querystr);
 
        if (pg_sock->conn == NULL) {
-               radlog(L_ERR, "Socket not connected");
+               radlog(L_ERR, "rlm_sql_postgresql: Socket not connected");
                return -1;
        }
 
        pg_sock->result = PQexec(pg_sock->conn, querystr);
        if (!pg_sock->result)
        {
-               radlog(L_ERR, "PostgreSQL Query failed Error: %s", 
+               radlog(L_ERR, "rlm_sql_postgresql: PostgreSQL Query failed Error: %s", 
                                PQerrorMessage(pg_sock->conn));
                return  -1;
        } else {
                ExecStatusType status = PQresultStatus(pg_sock->result);
 
-               radlog(L_DBG, "rlm_postgresql Status: %s", PQresStatus(status));
+               radlog(L_DBG, "rlm_sql_postgresql: Status: %s", PQresStatus(status));
 
-               radlog(L_DBG, "sql_postgresql: affected rows = %s",
+               radlog(L_DBG, "rlm_sql_postgresql: affected rows = %s",
                                PQcmdTuples(pg_sock->result));
 
                if (!status_is_ok(status))
@@ -238,8 +238,8 @@ static int sql_num_fields(SQLSOCK * sqlsocket, SQL_CONFIG *config) {
        rlm_sql_postgres_sock *pg_sock = sqlsocket->conn;
 
        if (!(num = PQnfields(pg_sock->result))) {
-               radlog(L_ERR, "PostgreSQL Error: Cannot get result");
-               radlog(L_ERR, "PostgreSQL error: %s", PQerrorMessage(pg_sock->conn));
+               radlog(L_ERR, "rlm_sql_postgresql: PostgreSQL Error: Cannot get result");
+               radlog(L_ERR, "rlm_sql_postgresql: PostgreSQL error: %s", PQerrorMessage(pg_sock->conn));
        }
        return num;
 }
@@ -345,6 +345,8 @@ static int sql_close(SQLSOCK * sqlsocket, SQL_CONFIG *config) {
 
        rlm_sql_postgres_sock *pg_sock = sqlsocket->conn;
 
+       if (!pg_sock->conn) return 0;
+
        PQfinish(pg_sock->conn);
        pg_sock->conn = NULL;