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 f8396fadab0888a7a586adfa91b0ee127ff5504c..1f090322f7f2287735161cf097c8a80260610934 100644 (file)
--- 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 a2900fe91e297e8107e8fda3b15747da3e4365a1..3c8f75c49aaad8525d39eb0bcd5d2b2a3ccef464 100644 (file)
--- 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