imapc: Don't duplicate standard mailbox flags in LIST replies.

We added the standard \NoSelect, \NonExistent, \NoInferiors and \Subscribed to special_use string, which caused them to be sent duplicated.
dovecot · Jan 14, 2016 · be3b937 · be3b937
1 parent 27f174f
commit be3b937
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/lib-storage/index/imapc/imapc-list.c b/src/lib-storage/index/imapc/imapc-list.c
@@ -660,7 +660,8 @@ imapc_list_write_special_use(struct imapc_mailbox_list_iterate_context *ctx,
 	str_truncate(ctx->special_use, 0);
 
 	for (i = 0; i < N_ELEMENTS(imap_list_flags); i++) {
-		if ((node->flags & imap_list_flags[i].flag) != 0) {
+		if ((node->flags & imap_list_flags[i].flag) != 0 &&
+		    (node->flags & MAILBOX_SPECIALUSE_MASK) != 0) {
 			str_append(ctx->special_use, imap_list_flags[i].str);
 			str_append_c(ctx->special_use, ' ');
 		}

diff --git a/src/lib-storage/mailbox-list.h b/src/lib-storage/mailbox-list.h
@@ -59,6 +59,7 @@ enum mailbox_info_flags {
 	MAILBOX_SPECIALUSE_SENT		= 0x00200000,
 	MAILBOX_SPECIALUSE_TRASH	= 0x00400000,
 	MAILBOX_SPECIALUSE_IMPORTANT	= 0x00800000,
+#define MAILBOX_SPECIALUSE_MASK		  0x00ff0000
 
 	/* Internally used by lib-storage: */
 	MAILBOX_SELECT			= 0x20000000,