From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 12 Jun 2017 11:16:13 +0000 (+0300)
Subject: lib-storage: If mailbox list iteration fails, don't add INBOX
X-Git-Tag: 2.3.0.rc1~1428
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=873a5bec86c4ee62dad8099cb12465e7aa42e261;p=thirdparty%2Fdovecot%2Fcore.git

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.
---

diff --git a/src/lib-storage/list/mailbox-list-iter.c b/src/lib-storage/list/mailbox-list-iter.c
index 2658da30e8..6ec7a2eba1 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);