From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Thu, 5 May 2016 15:10:46 +0000 (+0300)
Subject: lazy-expunge: Handle mailbox create race conditions.
X-Git-Tag: 2.3.0.rc1~3835
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5bc823952a118eeeab4e9f4e98f7f4ee72fc323;p=thirdparty%2Fdovecot%2Fcore.git

lazy-expunge: Handle mailbox create race conditions.

Don't log an error if another process just created the lazy-expunge mailbox.
---

diff --git a/src/plugins/lazy-expunge/lazy-expunge-plugin.c b/src/plugins/lazy-expunge/lazy-expunge-plugin.c
index c8efa18463..92e2593ea1 100644
--- a/src/plugins/lazy-expunge/lazy-expunge-plugin.c
+++ b/src/plugins/lazy-expunge/lazy-expunge-plugin.c
@@ -125,13 +125,19 @@ mailbox_open_or_create(struct mailbox_list *list, struct mailbox *src_box,
 	}
 
 	/* try creating and re-opening it. */
-	if (mailbox_create(box, NULL, FALSE) < 0 ||
-	    mailbox_open(box) < 0) {
+	if (mailbox_create(box, NULL, FALSE) < 0 &&
+	    mailbox_get_last_mail_error(box) != MAIL_ERROR_EXISTS) {
 		*error_r = t_strdup_printf("Failed to create mailbox %s: %s", name,
 					   mailbox_get_last_error(box, NULL));
 		mailbox_free(&box);
 		return NULL;
 	}
+	if (mailbox_open(box) < 0) {
+		*error_r = t_strdup_printf("Failed to open created mailbox %s: %s", name,
+					   mailbox_get_last_error(box, NULL));
+		mailbox_free(&box);
+		return NULL;
+	}
 	return box;
 }