From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Thu, 29 Jun 2023 10:46:41 +0000 (+0300)
Subject: lib-sql: sqlite - Retain last connection error
X-Git-Tag: 2.4.0~2652
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21791e2747c5527de4c9b7dbf03231c3bb6e2de3;p=thirdparty%2Fdovecot%2Fcore.git

lib-sql: sqlite - Retain last connection error
---

diff --git a/src/lib-sql/driver-sqlite.c b/src/lib-sql/driver-sqlite.c
index b619633eda..ae402d0cbd 100644
--- a/src/lib-sql/driver-sqlite.c
+++ b/src/lib-sql/driver-sqlite.c
@@ -62,6 +62,7 @@ static int driver_sqlite_connect(struct sql_db *_db)
 {
 	struct stat st;
 	struct sqlite_db *db = container_of(_db, struct sqlite_db, api);
+	const char *err;
 	/* this is default for sqlite_open */
 	int flags;
 
@@ -85,20 +86,22 @@ static int driver_sqlite_connect(struct sql_db *_db)
 	case SQLITE_READONLY:
 	case SQLITE_CANTOPEN:
 	case SQLITE_PERM:
-		if (stat(db->dbfile, &st) == -1 && errno == ENOENT) {
-			e_error(_db->event, "%s",
-				eacces_error_get_creating("creat", db->dbfile));
-		} else {
-			e_error(_db->event, "%s",
-				eacces_error_get("open", db->dbfile));
-		}
+		if (stat(db->dbfile, &st) == -1 && errno == ENOENT)
+			err = eacces_error_get_creating("creat", db->dbfile);
+		else
+			err = eacces_error_get("open", db->dbfile);
+		i_free(_db->last_connect_error);
+		_db->last_connect_error = i_strdup(err);
+		e_error(_db->event, "%s", err);
 		break;
 	case SQLITE_NOMEM:
 		i_fatal_status(FATAL_OUTOFMEM, "open(%s) failed: %s",
 			       db->dbfile, sqlite3_errmsg(db->sqlite));
 	default:
-		e_error(_db->event, "open(%s) failed: %s", db->dbfile,
-			sqlite3_errmsg(db->sqlite));
+		i_free(_db->last_connect_error);
+		_db->last_connect_error = i_strdup_printf("open(%s) failed: %s", db->dbfile,
+							  sqlite3_errmsg(db->sqlite));
+		e_error(_db->event, "%s", _db->last_connect_error);
 		break;
 	}