From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 4 Nov 2022 12:01:14 +0000 (+0200)
Subject: imapc: Fix listing INBOX when INBOX is already the namespace prefix
X-Git-Tag: 2.4.0~3440
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a485443e00a7e1b93ed9b7d065c89fcd2eb90865;p=thirdparty%2Fdovecot%2Fcore.git

imapc: Fix listing INBOX when INBOX is already the namespace prefix

This especially caused problems when using dsync with imapc, resulting in
"Remote lost mailbox GUID" errors.
---

diff --git a/src/lib-storage/index/imapc/imapc-list.c b/src/lib-storage/index/imapc/imapc-list.c
index e9c1f19000..0272c6c438 100644
--- a/src/lib-storage/index/imapc/imapc-list.c
+++ b/src/lib-storage/index/imapc/imapc-list.c
@@ -754,7 +754,9 @@ imapc_list_iter_next(struct mailbox_list_iterate_context *_ctx)
 		if (node == NULL)
 			return mailbox_list_iter_default_next(_ctx);
 	} while ((node->flags & MAILBOX_MATCHED) == 0 ||
-		 imapc_list_is_ns_root(ctx, node));
+		 (imapc_list_is_ns_root(ctx, node) &&
+		  (strcasecmp(vname, "INBOX") != 0 ||
+		   (ctx->info.ns->flags & NAMESPACE_FLAG_INBOX_ANY) == 0)));
 
 	if (ctx->info.ns->prefix_len > 0 &&
 	    strcasecmp(vname, "INBOX") != 0 &&