From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 16 Dec 2020 14:21:40 +0000 (+0200)
Subject: cassandra: Fix error handling on SSL initialization failure
X-Git-Tag: 2.3.14.rc1~164
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46df1de0ec87eb6e96bef3ac946a08895183bb29;p=thirdparty%2Fdovecot%2Fcore.git

cassandra: Fix error handling on SSL initialization failure
---

diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c
index 8b30f130e1..ea41d10865 100644
--- a/src/lib-sql/driver-cassandra.c
+++ b/src/lib-sql/driver-cassandra.c
@@ -1010,9 +1010,7 @@ static int driver_cassandra_init_full_v(const struct sql_settings *set,
 		return -1;
 	}
 
-	const char *tmp;
-	if (db->init_ssl &&
-	    (ret = driver_cassandra_init_ssl(db, &tmp)) < 0) {
+	if (db->init_ssl && driver_cassandra_init_ssl(db, error_r) < 0) {
 		driver_cassandra_free(&db);
 		return -1;
 	}