imap: imap_settings_verify() Make mail_utf8_extensions required for imap4rev2_enable

diff --git a/src/imap/imap-settings.c b/src/imap/imap-settings.c
index 9826727ae2bee82d43d16fb46ae1b765d7ccaba7..f42781fae0e197ac7476b1b53a28933e93240948 100644 (file)
--- a/src/imap/imap-settings.c
+++ b/src/imap/imap-settings.c
@@ -256,6 +256,11 @@ imap_settings_verify(void *_set, pool_t pool ATTR_UNUSED, const char **error_r)
        }
 #endif
 
+       if (set->imap4rev2_enable && !set->mail_utf8_extensions) {
+               *error_r = "imap4rev2_enable=yes requires mail_utf8_extensions=yes";
+               return FALSE;
+       }
+
        if (imap_settings_parse_workarounds(set, error_r) < 0)
                return FALSE;