From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 27 May 2025 07:08:41 +0000 (+0300)
Subject: lib-settings: Fix settings cache validity checks
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a5f98b5a5bff2f26f1fc633cae7bd127a7dd54c;p=thirdparty%2Fdovecot%2Fcore.git

lib-settings: Fix settings cache validity checks

inode and size checks were swapped, so settings caching didn't actually
work.
---

diff --git a/src/lib-settings/settings.c b/src/lib-settings/settings.c
index e3ecfbaa7c..72126555b2 100644
--- a/src/lib-settings/settings.c
+++ b/src/lib-settings/settings.c
@@ -398,14 +398,14 @@ settings_read_config_paths(struct settings_mmap *mmap,
 					    error_r) < 0)
 			return -1;
 		uint64_t inode, size;
-		if (settings_block_read_uint64(mmap, offset, mmap->mmap_size,
-					       "config path size",
-					       &size, error_r) < 0)
-			return -1;
 		if (settings_block_read_uint64(mmap, offset, mmap->mmap_size,
 					       "config path inode",
 					       &inode, error_r) < 0)
 			return -1;
+		if (settings_block_read_uint64(mmap, offset, mmap->mmap_size,
+					       "config path size",
+					       &size, error_r) < 0)
+			return -1;
 		uint32_t mtime_sec, mtime_nsec, ctime_sec, ctime_nsec;
 		if (settings_block_read_uint32(mmap, offset, mmap->mmap_size,
 					       "config path mtime sec",