From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 18 Jul 2012 22:20:50 +0000 (+0100)
Subject: Fixup SQL error message
X-Git-Tag: release_3_0_0_beta0~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1b9ea54af00ebbcbfea5bac223ff6d33bbab426;p=thirdparty%2Ffreeradius-server.git

Fixup SQL error message
---

diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c
index 2934cb87440..86e2b5fc21c 100644
--- a/src/modules/rlm_sql/sql.c
+++ b/src/modules/rlm_sql/sql.c
@@ -313,10 +313,11 @@ int rlm_sql_query(SQLSOCK **sqlsocket, SQL_INST *inst, char *query)
 		}
 		
 		if (ret < 0) {
-			radlog(L_ERR, "rlm_sql (%s): Database query error, %s: %s",
+			radlog(L_ERR,
+				   "rlm_sql (%s): Database query error '%s' in query '%s'",
 				   inst->config->xlat_name,
-				   query,
-				   (inst->module->sql_error)(*sqlsocket, inst->config));
+				   (inst->module->sql_error)(*sqlsocket, inst->config),
+				   query);
 		}
 		
 		return ret;
@@ -364,10 +365,11 @@ int rlm_sql_select_query(SQLSOCK **sqlsocket, SQL_INST *inst, char *query)
 		}
 		
 		if (ret < 0) {
-			radlog(L_ERR, "rlm_sql (%s): Database query error, %s: %s",
+			radlog(L_ERR,
+				   "rlm_sql (%s): Database query error '%s' in query '%s'",
 				   inst->config->xlat_name,
-				   query,
-				   (inst->module->sql_error)(*sqlsocket, inst->config));
+				   (inst->module->sql_error)(*sqlsocket, inst->config),
+				   query);
 		}
 		
 		return ret;