From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 8 Dec 2017 14:14:11 +0000 (+0200)
Subject: imapc: Don't skip listing "INBOX" when INBOX/ namespace prefix is used.
X-Git-Tag: 2.3.0.rc1~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50ba09cd2ed065d01d51580656ab4fa8b748e915;p=thirdparty%2Fdovecot%2Fcore.git

imapc: Don't skip listing "INBOX" when INBOX/ namespace prefix is used.

The INBOX was still listed as part of the autocreated mailboxes, unless
MAILBOX_LIST_ITER_NO_AUTO_BOXES was used.
---

diff --git a/src/lib-storage/index/imapc/imapc-list.c b/src/lib-storage/index/imapc/imapc-list.c
index 4857cda5be..aabe26c145 100644
--- a/src/lib-storage/index/imapc/imapc-list.c
+++ b/src/lib-storage/index/imapc/imapc-list.c
@@ -727,6 +727,7 @@ imapc_list_iter_next(struct mailbox_list_iterate_context *_ctx)
 	} while ((node->flags & MAILBOX_MATCHED) == 0);
 
 	if (ctx->info.ns->prefix_len > 0 &&
+	    strcasecmp(vname, "INBOX") != 0 &&
 	    strncmp(vname, ctx->info.ns->prefix, ctx->info.ns->prefix_len-1) == 0 &&
 	    vname[ctx->info.ns->prefix_len] == '\0' &&
 	    list->set->imapc_list_prefix[0] == '\0') {