From de8bdfb2257d16b99ccd5c1b8cbe6445bd9dd367 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Mon, 12 Jun 2017 14:16:13 +0300 Subject: [PATCH] lib-storage: If mailbox list iteration fails, don't add INBOX It possibly should have been returned by the list iteration itself and we could be returning it wrong here. Also calling this causes imapc to lost the error message in mailbox_list. --- src/lib-storage/list/mailbox-list-iter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib-storage/list/mailbox-list-iter.c b/src/lib-storage/list/mailbox-list-iter.c index 64a234d97d..92ebfd05d2 100644 --- a/src/lib-storage/list/mailbox-list-iter.c +++ b/src/lib-storage/list/mailbox-list-iter.c @@ -562,7 +562,7 @@ mailbox_list_ns_iter_try_next(struct mailbox_list_iterate_context *_ctx, bool has_children; if (ctx->cur_ns == NULL) { - if (!ctx->inbox_listed && ctx->inbox_list) { + if (!ctx->inbox_listed && ctx->inbox_list && !_ctx->failed) { /* send delayed INBOX reply */ ctx->inbox_listed = TRUE; inbox_set_children_flags(ctx); -- 2.47.3