From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Fri, 20 Aug 2021 08:43:27 +0000 (+0300)
Subject: lib-storage: maildir - Allow creating existing folder when rebuilding list index
X-Git-Tag: 2.3.17~142
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18afa46644badced53715df7e56f8ef73bab74dc;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: maildir - Allow creating existing folder when rebuilding list index
---

diff --git a/src/lib-storage/index/maildir/maildir-storage.c b/src/lib-storage/index/maildir/maildir-storage.c
index b400be3981..bda53e15a4 100644
--- a/src/lib-storage/index/maildir/maildir-storage.c
+++ b/src/lib-storage/index/maildir/maildir-storage.c
@@ -521,6 +521,9 @@ maildir_mailbox_create(struct mailbox *box, const struct mailbox_update *update,
 		       bool directory)
 {
 	const char *root_dir, *shared_path;
+	/* allow physical location to exist when we rebuild list index, this
+	   happens with LAYOUT=INDEX only. */
+	bool verify = box->storage->rebuilding_list_index;
 	struct stat st;
 	int ret;
 
@@ -528,7 +531,7 @@ maildir_mailbox_create(struct mailbox *box, const struct mailbox_update *update,
 		return ret;
 	ret = 0;
 	/* the maildir is created now. finish the creation as best as we can */
-	if (create_maildir_subdirs(box, FALSE) < 0)
+	if (create_maildir_subdirs(box, verify) < 0)
 		ret = -1;
 	if (maildir_create_maildirfolder_file(box) < 0)
 		ret = -1;