From: Timo Sirainen <tss@iki.fi>
Date: Fri, 29 Jan 2010 16:05:32 +0000 (+0200)
Subject: dsync: Message list wasn't sorted properly, which caused sync to be incomplete.
X-Git-Tag: 2.0.beta2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e93c262d264f39040333f3c741dea5da50a514d;p=thirdparty%2Fdovecot%2Fcore.git

dsync: Message list wasn't sorted properly, which caused sync to be incomplete.

--HG--
branch : HEAD
---

diff --git a/src/dsync/dsync-brain-msgs-new.c b/src/dsync/dsync-brain-msgs-new.c
index 38e0e54677..e40f356494 100644
--- a/src/dsync/dsync-brain-msgs-new.c
+++ b/src/dsync/dsync-brain-msgs-new.c
@@ -133,6 +133,7 @@ dsync_brain_mailbox_add_new_msgs(struct dsync_brain_msg_iter *iter,
 	msgs = array_get(&iter->new_msgs, &msg_count);
 	for (i = iter->next_new_msg; i < msg_count; i++) {
 		if (msgs[i].mailbox_idx != iter->mailbox_idx) {
+			i_assert(msgs[i].mailbox_idx > iter->mailbox_idx);
 			ret = FALSE;
 			break;
 		}
@@ -278,7 +279,7 @@ static int dsync_brain_new_msg_cmp(const struct dsync_brain_new_msg *m1,
 {
 	if (m1->mailbox_idx < m2->mailbox_idx)
 		return -1;
-	if (m1->mailbox_idx < m2->mailbox_idx)
+	if (m1->mailbox_idx > m2->mailbox_idx)
 		return 1;
 
 	if (m1->msg->uid < m2->msg->uid)