From: Timo Sirainen <tss@iki.fi>
Date: Wed, 14 May 2014 09:46:25 +0000 (+0300)
Subject: imap: Fixed enabling METADATA if imap_capability string was explicitly set
X-Git-Tag: 2.2.14.rc1~489
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd7fe09b7e54d58357bb82379bf2a358fa7e141d;p=thirdparty%2Fdovecot%2Fcore.git

imap: Fixed enabling METADATA if imap_capability string was explicitly set
---

diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c
index e0419ab34d..49e7a59d81 100644
--- a/src/imap/imap-client.c
+++ b/src/imap/imap-client.c
@@ -138,10 +138,10 @@ struct client *client_create(int fd_in, int fd_out, const char *session_id,
 		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);