dovecot-2.2: imap: Don't send MODSEQ in untagged FETCH reply if ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/4fc0fbed97f9
changeset: 17827:4fc0fbed97f9
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Sep 23 16:58:59 2014 +0300
description:
imap: Don't send MODSEQ in untagged FETCH reply if IMAP client didn't enable CONDSTORE/QRESYNC.
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.

diffstat:

 src/imap/imap-sync.c |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diffs (13 lines):

diff -r a25880e35b09 -r 4fc0fbed97f9 src/imap/imap-sync.c
--- a/src/imap/imap-sync.c	Mon Sep 22 16:08:25 2014 +0300
+++ b/src/imap/imap-sync.c	Tue Sep 23 16:58:59 2014 +0300
@@ -415,8 +415,7 @@
 	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, ' ');