dovecot-2.1: layout=fs: LIST may have shown mailbox as \HasNoChi...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/b016e771d8ab
changeset: 14411:b016e771d8ab
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Apr 11 14:29:37 2012 +0300
description:
layout=fs: LIST may have shown mailbox as \HasNoChildren when it did.
This probably only happened with mbox.

diffstat:

 src/lib-storage/list/mailbox-list-fs-iter.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (23 lines):

diff -r 7ec8f6515b0d -r b016e771d8ab src/lib-storage/list/mailbox-list-fs-iter.c
--- a/src/lib-storage/list/mailbox-list-fs-iter.c	Wed Apr 11 12:35:19 2012 +0300
+++ b/src/lib-storage/list/mailbox-list-fs-iter.c	Wed Apr 11 14:29:37 2012 +0300
@@ -323,13 +323,14 @@
 	dir->info_flags = info_flags;
 	p_array_init(&dir->entries, pool, 16);
 
-	if ((dir->info_flags & MAILBOX_CHILDREN) == 0) {
-		/* start with the assumption of not having children */
+	if (fs_list_dir_read(ctx, dir) < 0)
+		ctx->ctx.failed = TRUE;
+
+	if ((dir->info_flags & (MAILBOX_CHILDREN | MAILBOX_NOCHILDREN |
+				MAILBOX_NOINFERIORS)) == 0) {
+		/* assume this directory has no children */
 		dir->info_flags |= MAILBOX_NOCHILDREN;
 	}
-
-	if (fs_list_dir_read(ctx, dir) < 0)
-		ctx->ctx.failed = TRUE;
 	return dir;
 }