From: Martti Rannanjärvi <martti.rannanjarvi@dovecot.fi>
Date: Thu, 13 Sep 2018 10:01:52 +0000 (+0300)
Subject: lib-sql: Fix wrong sql_query_finished_event() success parameter use
X-Git-Tag: 2.3.4~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=071c4b1e1df00483cb5d27c82b17f74a4a20516c;p=thirdparty%2Fdovecot%2Fcore.git

lib-sql: Fix wrong sql_query_finished_event() success parameter use
---

diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c
index 1db3206196..c87503b17e 100644
--- a/src/lib-sql/driver-cassandra.c
+++ b/src/lib-sql/driver-cassandra.c
@@ -939,7 +939,8 @@ static void driver_cassandra_log_result(struct cassandra_result *result,
 
 	struct event_passthrough *e =
 		sql_query_finished_event(&db->api, result->api.event,
-					 result->query, FALSE, NULL);
+					 result->query, result->error == NULL,
+					 NULL);
 	if (result->error != NULL)
 		e->add_str("error", result->error);
 
diff --git a/src/lib-sql/driver-sqlite.c b/src/lib-sql/driver-sqlite.c
index f4343ef325..f0001b6bfc 100644
--- a/src/lib-sql/driver-sqlite.c
+++ b/src/lib-sql/driver-sqlite.c
@@ -141,11 +141,11 @@ driver_sqlite_escape_string(struct sql_db *_db ATTR_UNUSED,
 static void driver_sqlite_result_log(const struct sql_result *result, const char *query)
 {
 	struct sqlite_db *db = (struct sqlite_db *)result->db;
-	bool failed = !db->connected || (db->rc == SQLITE_OK);
+	bool success = db->connected && db->rc == SQLITE_OK;
 	int duration;
 	const char *suffix = "";
 	struct event_passthrough *e =
-		sql_query_finished_event(&db->api, result->event, query, failed,
+		sql_query_finished_event(&db->api, result->event, query, success,
 					 &duration);
 	io_loop_time_refresh();
 
diff --git a/src/lib-sql/driver-sqlpool.c b/src/lib-sql/driver-sqlpool.c
index 2b19152969..fd327131fe 100644
--- a/src/lib-sql/driver-sqlpool.c
+++ b/src/lib-sql/driver-sqlpool.c
@@ -622,7 +622,7 @@ static void driver_sqlpool_timeout(struct sqlpool_db *db)
 
 		if (request->query != NULL) {
 			e_error(sql_query_finished_event(&db->api, request->event,
-							 request->query, TRUE,
+							 request->query, FALSE,
 							 &duration)->
 					add_str("error", "Query timed out")->
 					event(),