lib-storage: revert maildir/mail_attachment_detection_options to "" for CE

as it breaks on maildir new/ because message flags can exist only in cur/

diff --git a/src/lib-settings/settings-history-core.txt b/src/lib-settings/settings-history-core.txt
index b065dfce0ad387f5573333e4d2e7652053ec8aa4..8b642cf9acce5c6eacec4938e897d65cfa58ab7f 100644 (file)
--- a/src/lib-settings/settings-history-core.txt
+++ b/src/lib-settings/settings-history-core.txt
@@ -12,6 +12,8 @@ default       lazy_expunge_only_last_instance no      2.4.3   3.2.0
 default        passdb_ldap/passdb_default_password_scheme      CRYPT   2.4.3   3.2.0
 default        passdb_passwd/passdb_default_password_scheme    CRYPT   2.4.3   3.2.0
 default        passdb_default_password_scheme  PLAIN   2.4.3   3.2.0
+default        maildir/mail_attachment_detection_options       add-flags content-type=!application/signature   2.4.3   -
+default        maildir/mail_attachment_detection_options               2.4.2   -
 default        mail_attachment_detection_options               2.4.2   3.2.0
 default        @metric_defaults/proxy/metric   auth_successes,auth_failures,login_aborted      2.4.2   3.2.0
 default        fts_search_read_fallback        yes     -       3.2.0

diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index 3ac7c8e4933b4b3d1facc4247ed12621523680cb..ea7a801b676d50efc251f5a8a9fb6a779eb17148 100644 (file)
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -213,6 +213,8 @@ static const struct setting_keyvalue mail_storage_default_settings_keyvalue[] =
           useful. Even when using imapc with shared folders, the missing
           attachment flags would normally be added by the remote server. */
        { "imapc/mail_attachment_detection_options", "" },
+       /* The unprefixed default breaks store to new/ directory */
+       { "maildir/mail_attachment_detection_options", "" },
        { NULL, NULL }
 };