dovecot-2.2: imap: Fixed enabling METADATA if imap_capability st...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/c22c139b2823
changeset: 17381:c22c139b2823
user:      Timo Sirainen <tss at iki.fi>
date:      Wed May 14 12:46:25 2014 +0300
description:
imap: Fixed enabling METADATA if imap_capability string was explicitly set

diffstat:

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

diffs (17 lines):

diff -r e7c737fc7e54 -r c22c139b2823 src/imap/imap-client.c
--- a/src/imap/imap-client.c	Wed May 14 12:28:17 2014 +0300
+++ b/src/imap/imap-client.c	Wed May 14 12:46:25 2014 +0300
@@ -138,10 +138,10 @@
 		if (!explicit_capability)
 			str_append(client->capability_string, " URLAUTH URLAUTH=BINARY");
 	}
-	if (set->imap_metadata && *mail_set->mail_attribute_dict != '\0' &&
-	    !explicit_capability) {
+	if (set->imap_metadata && *mail_set->mail_attribute_dict != '\0') {
 		client->imap_metadata_enabled = TRUE;
-		str_append(client->capability_string, " METADATA");
+		if (!explicit_capability)
+			str_append(client->capability_string, " METADATA");
 	}
 
 	ident = mail_user_get_anvil_userip_ident(client->user);