From 1ccc5eb7fb1d18214aeb131328acd7293ec2dfd9 Mon Sep 17 00:00:00 2001
From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 9 Jan 2018 15:35:13 -0500
Subject: [PATCH] lib-storage: mailbox_delete() - Fix cleanup in error handling

If removing index deletion mark failed, box->deleting wasn't set to FALSE
and the mailbox was left opened.
---
 src/lib-storage/mail-storage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index e711bc0d13..ea96939590 100644
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -1646,7 +1646,7 @@ int mailbox_delete(struct mailbox *box)
 		/* deletion failed. revert the mark so it can maybe be
 		   tried again later. */
 		if (mailbox_mark_index_deleted(box, FALSE) < 0)
-			return -1;
+			ret = -1;
 	}
 
 	box->deleting = FALSE;