From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 1 Jul 2016 09:23:59 +0000 (+0300)
Subject: lib-storage: Fixed mailbox_delete_empty() error message when mails exist
X-Git-Tag: 2.2.26~514
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=804d4d397b44840a40c4018074553978e27efb74;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Fixed mailbox_delete_empty() error message when mails exist
---

diff --git a/src/lib-storage/index/index-storage.c b/src/lib-storage/index/index-storage.c
index 0d5a407ad5..aa56da9054 100644
--- a/src/lib-storage/index/index-storage.c
+++ b/src/lib-storage/index/index-storage.c
@@ -718,7 +718,13 @@ int index_storage_mailbox_delete_pre(struct mailbox *box)
 		if (mailbox_sync(box, MAILBOX_SYNC_FLAG_FULL_READ) < 0)
 			return -1;
 		mailbox_get_open_status(box, STATUS_MESSAGES, &status);
-		if (status.messages != 0) {
+		if (status.messages == 0)
+			;
+		else if (box->deleting_must_be_empty) {
+			mail_storage_set_error(box->storage, MAIL_ERROR_EXISTS,
+					       "Mailbox isn't empty");
+			return -1;
+		} else {
 			mail_storage_set_error(box->storage, MAIL_ERROR_EXISTS,
 				"New mails were added to mailbox during deletion");
 			return -1;