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 788350841a55e5c3d16d119755c205267869caf6..4a5da3d13b1e178e1ba67c00e58cee7040d4e4c9 100644 (file)
--- 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 a1ab68802179079fc9e1d155c9d7f07eeec408f2..9934073472574c3392112de7daa04cb99f042c4d 100644 (file)
--- 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;