dovecot-2.2: lib-storage: Fixed listing INBOX's children with LA...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/692c1797a8c9
changeset: 16648:692c1797a8c9
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Aug 05 17:38:13 2013 +0300
description:
lib-storage: Fixed listing INBOX's children with LAYOUT=fs and non-mbox format.

diffstat:

 src/lib-storage/list/mailbox-list-fs-iter.c |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (23 lines):

diff -r dc60e46f0cb5 -r 692c1797a8c9 src/lib-storage/list/mailbox-list-fs-iter.c
--- a/src/lib-storage/list/mailbox-list-fs-iter.c	Mon Aug 05 16:59:21 2013 +0300
+++ b/src/lib-storage/list/mailbox-list-fs-iter.c	Mon Aug 05 17:38:13 2013 +0300
@@ -671,9 +671,16 @@
 				/* no children */
 			} else if ((ctx->ctx.list->flags &
 				    MAILBOX_LIST_FLAG_MAILBOX_FILES) == 0) {
-				/* skip its children also */
-				ctx->dir = dir;
-				pool_unref(&subdir->pool);
+				if (strcmp(storage_name, "INBOX") == 0) {
+					/* INBOX and its children are in
+					   different paths */
+					ctx->inbox_has_children = TRUE;
+				} else {
+					/* naming conflict, skip its
+					   children also */
+					ctx->dir = dir;
+					pool_unref(&subdir->pool);
+				}
 			} else if ((ctx->info.flags & MAILBOX_NOINFERIORS) == 0) {
 				/* INBOX itself is \NoInferiors, but this INBOX
 				   is a directory, and we can make INBOX have