From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Wed, 27 Sep 2023 09:39:28 +0000 (+0300)
Subject: lib-storage: list - Remove extra rmdir
X-Git-Tag: 2.4.0~2575
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84258b55e968f383583a1addffba8dd3c802b758;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: list - Remove extra rmdir

It's unnecessary and makes deletion fail if the first rmdir
already succeeded.

Broken in 97ffd8e0b0374b9ccbbc788cf796e15d021ad090
---

diff --git a/src/lib-storage/list/mailbox-list-delete.c b/src/lib-storage/list/mailbox-list-delete.c
index 6b9c0c84ad..e59ca09ea1 100644
--- a/src/lib-storage/list/mailbox-list-delete.c
+++ b/src/lib-storage/list/mailbox-list-delete.c
@@ -236,7 +236,7 @@ int mailbox_list_delete_mailbox_nonrecursive(struct mailbox_list *list,
 			i_sleep_msecs(100);
 			ret = rmdir(path);
 		}
-		if (rmdir(path) == 0)
+		if (ret == 0)
 			unlinked_something = TRUE;
 		else if (errno == ENOENT) {
 			/* race condition with another process, which finished