Fixup SQL error message

diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c
index 2934cb8..86e2b5f 100644 (file)
--- 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;