dovecot-2.2: lib-index: Don't log an error if UIDVALIDITY changes.

dovecot at dovecot.org dovecot at dovecot.org
Tue May 22 17:05:02 EEST 2012


details:   http://hg.dovecot.org/dovecot-2.2/rev/ad6aa4e042f5
changeset: 14578:ad6aa4e042f5
user:      Timo Sirainen <tss at iki.fi>
date:      Tue May 22 16:54:43 2012 +0300
description:
lib-index: Don't log an error if UIDVALIDITY changes.
Normally this should be done by backend only by resetting the index, but
it can be done also by dsync.

diffstat:

 src/lib-index/mail-index-sync-update.c |  10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diffs (27 lines):

diff -r a47c95872745 -r ad6aa4e042f5 src/lib-index/mail-index-sync-update.c
--- a/src/lib-index/mail-index-sync-update.c	Sun May 20 03:32:55 2012 +0300
+++ b/src/lib-index/mail-index-sync-update.c	Tue May 22 16:54:43 2012 +0300
@@ -456,7 +456,6 @@
 	struct mail_index_map *map = ctx->view->map;
 	uint32_t orig_log_file_tail_offset = map->hdr.log_file_tail_offset;
 	uint32_t orig_next_uid = map->hdr.next_uid;
-	uint32_t orig_uid_validity = map->hdr.uid_validity;
 
 	if (u->offset >= map->hdr.base_header_size ||
 	    u->offset + u->size > map->hdr.base_header_size) {
@@ -479,15 +478,6 @@
 		       u + 1, sizeof(map->hdr) - u->offset);
 	}
 
-	/* UIDVALIDITY can be changed only by resetting the index */
-	if (orig_uid_validity != 0 &&
-	    MAIL_INDEX_HEADER_UPDATE_FIELD_IN_RANGE(u, uid_validity)) {
-		mail_index_sync_set_corrupted(ctx,
-			"uid_validity updated unexpectedly: %u -> %u",
-			orig_uid_validity, map->hdr.uid_validity);
-		/* let it through anyway, although this could give wrong
-		   "next_uid shrank" errors if the value actually changed.. */
-	}
 	if (map->hdr.next_uid < orig_next_uid) {
 		mail_index_sync_set_corrupted(ctx,
 			"next_uid shrank ignored: %u -> %u",


More information about the dovecot-cvs mailing list