From: Timo Sirainen <tss@iki.fi>
Date: Wed, 26 Jun 2013 16:33:38 +0000 (+0300)
Subject: dsync: Fixed syncing when one of the backends supported GUIDs.
X-Git-Tag: 2.2.5~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34b8b14ce06c0939932b60f22f61aea124198438;p=thirdparty%2Fdovecot%2Fcore.git

dsync: Fixed syncing when one of the backends supported GUIDs.
---

diff --git a/src/doveadm/dsync/dsync-mailbox-import.c b/src/doveadm/dsync/dsync-mailbox-import.c
index 57f7b1d6f4..8d27cc84f8 100644
--- a/src/doveadm/dsync/dsync-mailbox-import.c
+++ b/src/doveadm/dsync/dsync-mailbox-import.c
@@ -758,7 +758,8 @@ static bool dsync_check_cur_guid(struct dsync_mailbox_importer *importer,
 {
 	const char *cmp_guid;
 
-	if (change->guid == NULL || *change->guid == '\0')
+	if (change->guid == NULL || change->guid[0] == '\0' ||
+	    importer->cur_guid[0] == '\0')
 		return TRUE;
 	if (!dsync_mail_change_guid_equals(change, importer->cur_guid, &cmp_guid)) {
 		dsync_import_unexpected_state(importer, t_strdup_printf(