]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lib-storage: If mailbox list iteration fails, don't add INBOX
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Mon, 12 Jun 2017 11:16:13 +0000 (14:16 +0300)
committerVille Savolainen <ville.savolainen@dovecot.fi>
Tue, 13 Jun 2017 09:06:42 +0000 (12:06 +0300)
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

index 64a234d97de41822502b67a037475122d780137d..92ebfd05d2316cd4df56e6a1710ed878aa0082ab 100644 (file)
@@ -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);