From: Timo Sirainen <tss@iki.fi>
Date: Thu, 26 Jun 2008 18:35:06 +0000 (+0300)
Subject: Sort index sometimes failed wrongly with "Sort IDs broken" errors.
X-Git-Tag: 1.2.alpha1~207
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=69d6f9a1cb91d71079f736ce8b3d4abb2a615255;p=thirdparty%2Fdovecot%2Fcore.git

Sort index sometimes failed wrongly with "Sort IDs broken" errors.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/index/index-sort-string.c b/src/lib-storage/index/index-sort-string.c
index dc17c83b71..6f62529e22 100644
--- a/src/lib-storage/index/index-sort-string.c
+++ b/src/lib-storage/index/index-sort-string.c
@@ -613,7 +613,9 @@ index_sort_add_ids_range(struct sort_string_context *ctx,
 		}
 		nodes[i].sort_id_changed = TRUE;
 	}
-	return right_str == NULL || strcmp(str, right_str) < 0 ? 0 : -1;
+	return right_str == NULL || strcmp(str, right_str) < 0 ||
+		(strcmp(str, right_str) == 0 &&
+		 nodes[i-1].sort_id == right_sort_id) ? 0 : -1;
 }
 
 static int