From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 17 Oct 2011 16:15:28 +0000 (+0200)
Subject: Removed knowledge of sqlsocket->id
X-Git-Tag: release_3_0_0_beta0~583
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=979eab5d780b86dfc9d718ff2099892365308046;p=thirdparty%2Ffreeradius-server.git

Removed knowledge of sqlsocket->id

The drivers have no business using it
---

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/sql_firebird.c b/src/modules/rlm_sql/drivers/rlm_sql_firebird/sql_firebird.c
index 11b6ba662fd..d7319555e07 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/sql_firebird.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/sql_firebird.c
@@ -90,8 +90,6 @@ static int sql_destroy_socket(SQLSOCK *sqlsocket, SQL_CONFIG *config)
 static int sql_query(SQLSOCK *sqlsocket, SQL_CONFIG *config, char *querystr) {
     rlm_sql_firebird_sock *firebird_sock = sqlsocket->conn;
     int deadlock=0;
- if (config->sqltrace)
-        radlog(L_DBG, "sock_id %i: query:  %s", sqlsocket->id,querystr);
 
 #ifdef _PTHREAD_H
  pthread_mutex_lock(&firebird_sock->mut);
@@ -102,14 +100,13 @@ TryAgain:
 //Try again query when deadlock, beacuse in any case it will be retried.
 // but may be lost for short sessions
    if ((firebird_sock->sql_code==DEADLOCK_SQL_CODE) && !deadlock) {
-      radlog(L_DBG,"sock_id %i: deadlock. Retry query %s\n",sqlsocket->id,querystr);
+      radlog(L_DBG,"sock_id deadlock. Retry query %s\n",querystr);
 //For non READ_COMMITED transactions put rollback here
 // fb_rollback(sock);
       deadlock=1;
       goto TryAgain;
    }
-   radlog(L_ERR, "sock_id %i: rlm_sql_firebird,sql_query error:sql_code=%li, error='%s', query=%s\n",
-     sqlsocket->id,
+   radlog(L_ERR, "sock_id rlm_sql_firebird,sql_query error:sql_code=%li, error='%s', query=%s\n",
      firebird_sock->sql_code,
      firebird_sock->lasterror,
      querystr);
@@ -185,7 +182,6 @@ static int sql_num_fields(SQLSOCK *sqlsocket, SQL_CONFIG *config) {
  *************************************************************************/
 static int sql_num_rows(SQLSOCK *sqlsocket, SQL_CONFIG *config) {
     int res=sql_affected_rows(sqlsocket, config);
-    radlog(L_DBG,"sock_id %i: sql_num_rows: %i\n",sqlsocket->id,res);
     return res;
 }
 
@@ -295,7 +291,6 @@ static int sql_affected_rows(SQLSOCK *sqlsocket, SQL_CONFIG *config) {
  int affected_rows=fb_affected_rows(sqlsocket->conn);
  if (affected_rows<0)
    radlog(L_ERR, "sql_affected_rows, rlm_sql_firebird. error:%s\n", sql_error(sqlsocket,config));
- radlog(L_DBG,"sock_id %i: affected_rows: %i\n",sqlsocket->id,affected_rows);
  return affected_rows;
 }
 
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_freetds/sql_freetds.c b/src/modules/rlm_sql/drivers/rlm_sql_freetds/sql_freetds.c
index bb044cd2c83..a56576a66f4 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_freetds/sql_freetds.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_freetds/sql_freetds.c
@@ -92,7 +92,7 @@ static int sql_init_socket(SQLSOCK *sqlsocket, SQL_CONFIG *config)
 	freetds_sock = sqlsocket->conn;
 	memset(freetds_sock, 0, sizeof(*freetds_sock));
 	
-	radlog(L_INFO, "rlm_sql_freetds (%s): Starting connect to FreeTDS/MSSQL server for #%d", config->xlat_name, sqlsocket->id);
+	radlog(L_INFO, "rlm_sql_freetds (%s): Starting connect to FreeTDS/MSSQL server", config->xlat_name);
 	
 	if (!(login = dblogin())) {
 		radlog(L_ERR, "rlm_sql_freetds (%s): Unable to allocate login record", config->xlat_name);
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 85e3e76042f..48d437a759b 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c
@@ -76,8 +76,7 @@ static int sql_init_socket(SQLSOCK *sqlsocket, SQL_CONFIG *config)
 	mysql_sock = sqlsocket->conn;
 	memset(mysql_sock, 0, sizeof(*mysql_sock));
 
-	radlog(L_INFO, "rlm_sql_mysql: Starting connect to MySQL server for #%d",
-			sqlsocket->id);
+	radlog(L_INFO, "rlm_sql_mysql: Starting connect to MySQL server");
 
 	mysql_init(&(mysql_sock->conn));
 	mysql_options(&(mysql_sock->conn), MYSQL_READ_DEFAULT_GROUP, "freeradius");
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/sql_sqlite.c b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/sql_sqlite.c
index d7bd2b992ff..8d7e467cf7d 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/sql_sqlite.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/sql_sqlite.c
@@ -67,8 +67,8 @@ static int sql_init_socket(SQLSOCK *sqlsocket, SQL_CONFIG *config)
 			 radius_dir);
 		filename = buffer;
 	}
-	radlog(L_INFO, "rlm_sql_sqlite: Opening sqlite database %s for #%d",
-	       filename, sqlsocket->id);
+	radlog(L_INFO, "rlm_sql_sqlite: Opening sqlite database %s",
+	       filename);
 	
 	status = sqlite3_open(filename, &sqlite_sock->pDb);
 	radlog(L_INFO, "rlm_sql_sqlite: sqlite3_open() = %d\n", status);