dovecot-2.2: dsync: Fixed syncing when one of the backends suppo...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/f3b9325509fd
changeset: 16558:f3b9325509fd
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Jun 26 19:33:38 2013 +0300
description:
dsync: Fixed syncing when one of the backends supported GUIDs.

diffstat:

 src/doveadm/dsync/dsync-mailbox-import.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (13 lines):

diff -r 230f111056b4 -r f3b9325509fd src/doveadm/dsync/dsync-mailbox-import.c
--- a/src/doveadm/dsync/dsync-mailbox-import.c	Wed Jun 26 15:44:08 2013 +0300
+++ b/src/doveadm/dsync/dsync-mailbox-import.c	Wed Jun 26 19:33:38 2013 +0300
@@ -758,7 +758,8 @@
 {
 	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(