From: Timo Sirainen <tss@iki.fi>
Date: Tue, 8 Feb 2011 20:17:44 +0000 (+0200)
Subject: mbox: No longer try to preserve sync stamps from v1.0 mbox index files.
X-Git-Tag: 2.1.alpha1~362
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bf9b56dfb1913264e4fe2ee5932becbcbb459c5;p=thirdparty%2Fdovecot%2Fcore.git

mbox: No longer try to preserve sync stamps from v1.0 mbox index files.
The worst that can happen is if a v1.0 user upgrades to v2.1, an mbox gets
resynced unnecessarily.
---

diff --git a/src/lib-storage/index/mbox/mbox-sync.c b/src/lib-storage/index/mbox/mbox-sync.c
index fc53776afa..4873c4aaa8 100644
--- a/src/lib-storage/index/mbox/mbox-sync.c
+++ b/src/lib-storage/index/mbox/mbox-sync.c
@@ -1628,7 +1628,6 @@ static int mbox_sync_do(struct mbox_sync_context *sync_ctx,
 
 int mbox_sync_header_refresh(struct mbox_mailbox *mbox)
 {
-	const struct mail_index_header *hdr;
 	const void *data;
 	size_t data_size;
 
@@ -1640,10 +1639,8 @@ int mbox_sync_header_refresh(struct mbox_mailbox *mbox)
 	mail_index_get_header_ext(mbox->box.view, mbox->mbox_ext_idx,
 				  &data, &data_size);
 	if (data_size == 0) {
-		/* doesn't exist. FIXME: backwards compatibility copying */
-		hdr = mail_index_get_header(mbox->box.view);
-		mbox->mbox_hdr.sync_mtime = hdr->sync_stamp;
-		mbox->mbox_hdr.sync_size = hdr->sync_size;
+		/* doesn't exist yet. */
+		memset(&mbox->mbox_hdr, 0, sizeof(mbox->mbox_hdr));
 		return 0;
 	}