From: Timo Sirainen <tss@iki.fi>
Date: Thu, 11 Sep 2008 13:37:32 +0000 (+0300)
Subject: Maildir saving: If uidlist locking timed out and we needed it, fail instead of trying... 
X-Git-Tag: 1.2.alpha2~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=62a6a8d68a5b020c64d89fdbd62bcfacb0a999d0;p=thirdparty%2Fdovecot%2Fcore.git

Maildir saving: If uidlist locking timed out and we needed it, fail instead of trying to continue (and break).

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/index/maildir/maildir-save.c b/src/lib-storage/index/maildir/maildir-save.c
index 507feb190e..991cb3960a 100644
--- a/src/lib-storage/index/maildir/maildir-save.c
+++ b/src/lib-storage/index/maildir/maildir-save.c
@@ -675,7 +675,8 @@ int maildir_transaction_save_commit_pre(struct maildir_save_context *ctx)
 	}
 	ret = maildir_uidlist_sync_init(ctx->mbox->uidlist, sync_flags,
 					&ctx->uidlist_sync_ctx);
-	if (ret < 0) {
+	if (ret <= 0 &&
+	    (ret < 0 || (sync_flags & MAILDIR_UIDLIST_SYNC_TRYLOCK) == 0)) {
 		maildir_transaction_save_rollback(ctx);
 		return -1;
 	}