[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-sync-parse.c, 1.60, 1.61 mbox-sync.c, 1.205, 1.206

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/mbox
In directory talvi:/tmp/cvs-serv29486

Modified Files:
	mbox-sync-parse.c mbox-sync.c 
Log Message:
If a broken X-UID header was found with a value larger than last seen X-UID
(eg. empty mbox) but less than the expected UID value, we gave "UID inserted
in the middle of mailbox" error.



Index: mbox-sync-parse.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync-parse.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- mbox-sync-parse.c	10 Mar 2007 16:05:48 -0000	1.60
+++ mbox-sync-parse.c	23 Mar 2007 02:46:20 -0000	1.61
@@ -385,7 +385,6 @@
 		return FALSE;
 	}
 
-	ctx->sync_ctx->prev_msg_uid = value;
 	ctx->mail.uid = value;
 	/* if we had multiple X-UID headers, we could have
 	   uid_broken=TRUE here. */

Index: mbox-sync.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync.c,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -d -r1.205 -r1.206
--- mbox-sync.c	21 Mar 2007 21:57:16 -0000	1.205
+++ mbox-sync.c	23 Mar 2007 02:46:20 -0000	1.206
@@ -1190,8 +1190,8 @@
 
 			mail_ctx->need_rewrite = TRUE;
 			mail_ctx->mail.uid = sync_ctx->next_uid++;
-			sync_ctx->prev_msg_uid = mail_ctx->mail.uid;
 		}
+		sync_ctx->prev_msg_uid = mail_ctx->mail.uid;
 
 		if (!mail_ctx->mail.pseudo)
 			mail_ctx->mail.idx_seq = sync_ctx->idx_seq;