From: Timo Sirainen <tss@iki.fi>
Date: Sat, 25 Oct 2008 17:25:27 +0000 (+0300)
Subject: Fixes to mailbox list iteration (fixes some issues with virtual mailboxes).
X-Git-Tag: 1.2.alpha4~154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7157fa0ad659fa7984f3e6c59c195221c53ac64;p=thirdparty%2Fdovecot%2Fcore.git

Fixes to mailbox list iteration (fixes some issues with virtual mailboxes).

--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 788350841a..4a5da3d13b 100644
--- a/src/lib-storage/list/mailbox-list-fs-iter.c
+++ b/src/lib-storage/list/mailbox-list-fs-iter.c
@@ -226,6 +226,7 @@ fs_list_iter_init(struct mailbox_list *_list, const char *const *patterns,
 	ctx->next = fs_list_next;
 	ctx->sep = (flags & MAILBOX_LIST_ITER_VIRTUAL_NAMES) != 0 ?
 		_list->ns->sep : _list->ns->real_sep;
+	ctx->info.ns = _list->ns;
 
 	prefix_len = strlen(_list->ns->prefix);
 	i_array_init(&ctx->valid_patterns, 8);
diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index a1ab688021..9934073472 100644
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -467,6 +467,7 @@ mailbox_list_iter_init_namespaces(struct mail_namespace *namespaces,
 	pool = pool_alloconly_create("mailbox list namespaces", 256);
 	ctx = p_new(pool, struct ns_list_iterate_context, 1);
 	ctx->pool = pool;
+	ctx->ctx.flags = flags;
 	ctx->ctx.list = p_new(pool, struct mailbox_list, 1);
 	ctx->ctx.list->v.iter_next = mailbox_list_ns_iter_next;
 	ctx->ctx.list->v.iter_deinit = mailbox_list_ns_iter_deinit;