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 e9c1f190007da588fa496d8b8605347c6e971d34..0272c6c4381da0703fa15a69a9a10318f4555a74 100644 (file)
--- 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 &&