From: Timo Sirainen <tss@iki.fi>
Date: Mon, 29 Mar 2010 14:47:44 +0000 (+0300)
Subject: fs layout: Fixed listing child mailboxes under INBOX.
X-Git-Tag: 2.0.beta5~258
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a52e2f737616d4f8bca177e84d381c216560d54f;p=thirdparty%2Fdovecot%2Fcore.git

fs layout: Fixed listing child mailboxes under INBOX.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/list/mailbox-list-fs-iter.c b/src/lib-storage/list/mailbox-list-fs-iter.c
index 966ddf9286..c26034916d 100644
--- a/src/lib-storage/list/mailbox-list-fs-iter.c
+++ b/src/lib-storage/list/mailbox-list-fs-iter.c
@@ -441,8 +441,11 @@ list_file_inbox(struct fs_list_iterate_context *ctx, const char *fname)
 	}
 	inbox_flags_set(ctx);
 
-	if (list_file_is_inbox(ctx, fname)) {
-		/* delay listing in case there's a INBOX/ directory */
+	if (list_file_is_inbox(ctx, fname) &&
+	    (ctx->ctx.list->flags & MAILBOX_LIST_FLAG_MAILBOX_FILES) != 0) {
+		/* delay listing in case there's a INBOX/ directory.
+		   do this only when INBOX is a file! otherwise we won't list
+		   INBOX children. */
 		ctx->inbox_found = TRUE;
 		ctx->inbox_flags = ctx->info.flags;
 		return FALSE;