From: Timo Sirainen <tss@iki.fi>
Date: Tue, 2 Nov 2010 19:23:37 +0000 (+0000)
Subject: lib-storage: Maildir++ mailbox listing could have given wrong flags to parent mailboxes.
X-Git-Tag: 2.0.7~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89ad7c33273f0335002e93102932c6e8c28e202d;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Maildir++ mailbox listing could have given wrong flags to parent mailboxes.
---

diff --git a/src/lib-storage/list/mailbox-list-maildir-iter.c b/src/lib-storage/list/mailbox-list-maildir-iter.c
index b60499f0ec..b1b45d3e40 100644
--- a/src/lib-storage/list/mailbox-list-maildir-iter.c
+++ b/src/lib-storage/list/mailbox-list-maildir-iter.c
@@ -42,7 +42,7 @@ static void node_fix_parents(struct mailbox_node *node)
 static void
 maildir_fill_parents(struct maildir_list_iterate_context *ctx,
 		     struct imap_match_glob *glob, bool update_only,
-		     string_t *mailbox, enum mailbox_info_flags flags)
+		     string_t *mailbox)
 {
 	struct mail_namespace *ns = ctx->ctx.list->ns;
 	struct mailbox_node *node;
@@ -75,7 +75,7 @@ maildir_fill_parents(struct maildir_list_iterate_context *ctx,
 			}
 			if (!update_only)
 				node->flags |= MAILBOX_MATCHED;
-			node->flags |= MAILBOX_CHILDREN | flags;
+			node->flags |= MAILBOX_CHILDREN;
 			node->flags &= ~MAILBOX_NOCHILDREN;
 			node_fix_parents(node);
 		}
@@ -338,7 +338,7 @@ maildir_fill_readdir(struct maildir_list_iterate_context *ctx,
 		if ((match & IMAP_MATCH_PARENT) != 0) {
 			T_BEGIN {
 				maildir_fill_parents(ctx, glob, update_only,
-						     mailbox, flags);
+						     mailbox);
 			} T_END;
 		} else {
 			created = FALSE;