From: Timo Sirainen <tss@iki.fi>
Date: Sun, 4 Apr 2010 19:24:43 +0000 (+0300)
Subject: sdbox: mailbox_update() could have changed UIDVALIDITY incorrectly.
X-Git-Tag: 2.0.beta5~251
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=547e916f4e6f01af682f8b6e032c337f2a699364;p=thirdparty%2Fdovecot%2Fcore.git

sdbox: mailbox_update() could have changed UIDVALIDITY incorrectly.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/index/dbox-single/sdbox-storage.c b/src/lib-storage/index/dbox-single/sdbox-storage.c
index 1c2e085d12..d0cfeb1964 100644
--- a/src/lib-storage/index/dbox-single/sdbox-storage.c
+++ b/src/lib-storage/index/dbox-single/sdbox-storage.c
@@ -120,7 +120,9 @@ static int sdbox_write_index_header(struct mailbox *box,
 
 	if (update != NULL && update->uid_validity != 0)
 		uid_validity = update->uid_validity;
-	else if (hdr->uid_validity == 0) {
+	else if (hdr->uid_validity != 0)
+		uid_validity = hdr->uid_validity;
+	else {
 		/* set uidvalidity */
 		uid_validity = dbox_get_uidvalidity_next(box->list);
 	}