imap: Don't send MODSEQ in untagged FETCH reply if IMAP client didn't enable CONDSTOR...

We should have been checking client->enabled_features, not
mailbox_get_enabled_features(). The former contains the features enabled by
the IMAP client, while the latter contains also some automatically added
features.

diff --git a/src/imap/imap-sync.c b/src/imap/imap-sync.c
index af77420cdc21b90dd653377a600b5292b1299869..f452170609e0e9053a4895edd9e0905e2233a92d 100644 (file)
--- a/src/imap/imap-sync.c
+++ b/src/imap/imap-sync.c
@@ -415,8 +415,7 @@ static int imap_sync_send_flags(struct imap_sync_context *ctx, string_t *str)
        str_printfa(str, "* %u FETCH (", ctx->seq);
        if (ctx->imap_flags & IMAP_SYNC_FLAG_SEND_UID)
                str_printfa(str, "UID %u ", ctx->mail->uid);
-       if ((mailbox_get_enabled_features(ctx->box) &
-            MAILBOX_FEATURE_CONDSTORE) != 0 &&
+       if ((ctx->client->enabled_features & MAILBOX_FEATURE_CONDSTORE) != 0 &&
            !ctx->client->nonpermanent_modseqs) {
                imap_sync_add_modseq(ctx, str);
                str_append_c(str, ' ');