From: Timo Sirainen <tss@iki.fi>
Date: Wed, 4 Aug 2010 15:28:10 +0000 (+0100)
Subject: dsync backup: Don't go to infinite loop when mailbox needs to be recreated.
X-Git-Tag: 2.0.rc4~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac4cbd84e85940dd2160651fba5e102b6c7ec32d;p=thirdparty%2Fdovecot%2Fcore.git

dsync backup: Don't go to infinite loop when mailbox needs to be recreated.
---

diff --git a/src/dsync/dsync-brain-msgs.c b/src/dsync/dsync-brain-msgs.c
index 7de820b3e5..20f26e9187 100644
--- a/src/dsync/dsync-brain-msgs.c
+++ b/src/dsync/dsync-brain-msgs.c
@@ -96,11 +96,13 @@ dsync_brain_msg_iter_skip_mailbox(struct dsync_brain_mailbox_sync *sync)
 {
 	int ret;
 
-	while ((ret = dsync_brain_msg_iter_next(sync->src_msg_iter)) > 0) ;
+	while ((ret = dsync_brain_msg_iter_next(sync->src_msg_iter)) > 0)
+		sync->src_msg_iter->msg.guid = NULL;
 	if (ret == 0)
 		return 0;
 
-	while ((ret = dsync_brain_msg_iter_next(sync->dest_msg_iter)) > 0) ;
+	while ((ret = dsync_brain_msg_iter_next(sync->dest_msg_iter)) > 0)
+		sync->dest_msg_iter->msg.guid = NULL;
 	if (ret == 0)
 		return 0;