From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Sun, 2 Mar 2025 10:34:11 +0000 (+0200)
Subject: lib-storage: For Pro edition, change default mail_always_cache_fields
X-Git-Tag: 2.4.1~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f59da21e49f3b86ca2dd235b6c1973fd85aafb7;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: For Pro edition, change default mail_always_cache_fields

This shouldn't really be required anymore, but for now we'll recommend it
for Pro installations.
---

diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index f8396fadab..1f090322f7 100644
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -204,6 +204,9 @@ static const struct setting_keyvalue mail_storage_default_settings_keyvalue[] =
 	/* POP3: */ \
 	"pop3.uidl pop3.order"
 	{ "mail_cache_fields", MAIL_CACHE_FIELDS_DEFAULT },
+#ifdef DOVECOT_PRO_EDITION
+	{ "mail_always_cache_fields", MAIL_CACHE_FIELDS_DEFAULT },
+#endif
 	{ "mail_never_cache_fields", "imap.envelope" },
 	{ NULL, NULL }
 };
diff --git a/src/lib-storage/test-mail.c b/src/lib-storage/test-mail.c
index a2900fe91e..3c8f75c49a 100644
--- a/src/lib-storage/test-mail.c
+++ b/src/lib-storage/test-mail.c
@@ -339,6 +339,7 @@ static void test_attachment_flags_during_header_fetch(void)
 		.driver = "sdbox",
 		.extra_input = (const char *const[]) {
 			"mail_attachment_detection_options=add-flags",
+			"mail_always_cache_fields=flags",
 			"mail_cache_fields=flags",
 			"mail_never_cache_fields=mime.parts",
 			NULL