dovecot-2.1: lib-storage: Make sure both MAILBOX_CHILDREN and MA...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/e928c1575689
changeset: 14476:e928c1575689
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Apr 25 16:44:00 2012 +0300
description:
lib-storage: Make sure both MAILBOX_CHILDREN and MAILBOX_NOCHILDREN flags aren't set.

diffstat:

 src/lib-storage/mailbox-list-iter.c |  2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diffs (12 lines):

diff -r cb78154a9c0c -r e928c1575689 src/lib-storage/mailbox-list-iter.c
--- a/src/lib-storage/mailbox-list-iter.c	Wed Apr 25 16:29:22 2012 +0300
+++ b/src/lib-storage/mailbox-list-iter.c	Wed Apr 25 16:44:00 2012 +0300
@@ -762,6 +762,8 @@
 			if (node != NULL) {
 				if (!ctx->update_only && add_matched)
 					node->flags |= MAILBOX_MATCHED;
+				if ((always_flags & MAILBOX_CHILDREN) != 0)
+					node->flags &= ~MAILBOX_NOCHILDREN;
 				node->flags |= always_flags;
 			}
 			/* We don't want to show the parent mailboxes unless