From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 8 Mar 2024 12:35:12 +0000 (+0200)
Subject: lib-sql: pgsql - Fix logging database name on connection failure
X-Git-Tag: 2.4.1~975
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4128bfe41fad4bf7281f4b0bfb1fef9879ca671e;p=thirdparty%2Fdovecot%2Fcore.git

lib-sql: pgsql - Fix logging database name on connection failure
---

diff --git a/src/lib-sql/driver-pgsql.c b/src/lib-sql/driver-pgsql.c
index dd6beeca10..3c158acc43 100644
--- a/src/lib-sql/driver-pgsql.c
+++ b/src/lib-sql/driver-pgsql.c
@@ -255,8 +255,11 @@ static int driver_pgsql_connect(struct sql_db *_db)
 	(void)PQsetNoticeProcessor(db->pg, pgsql_notice_processor, db);
 
 	if (PQstatus(db->pg) == CONNECTION_BAD) {
+		const char *name = PQdb(db->pg);
+		if (name == NULL)
+			name = db->host;
 		e_error(_db->event, "Connect failed to database %s: %s",
-			PQdb(db->pg), last_error(db));
+			name, last_error(db));
 		i_free(db->api.last_connect_error);
 		db->api.last_connect_error = i_strdup(last_error(db));
 		driver_pgsql_close(db);