dovecot-2.2: dsync: Fixed handling expunges when GUIDs aren't su...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/af8ce0a84bb5
changeset: 16556:af8ce0a84bb5
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Jun 26 15:29:43 2013 +0300
description:
dsync: Fixed handling expunges when GUIDs aren't supported by the backend(s).

diffstat:

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

diffs (15 lines):

diff -r 2dd27b0e7e49 -r af8ce0a84bb5 src/doveadm/dsync/dsync-mailbox-import.c
--- a/src/doveadm/dsync/dsync-mailbox-import.c	Wed Jun 26 14:37:34 2013 +0300
+++ b/src/doveadm/dsync/dsync-mailbox-import.c	Wed Jun 26 15:29:43 2013 +0300
@@ -1283,6 +1283,11 @@
 	/* verify hdr_hash if it exists */
 	if (change->hdr_hash == NULL) {
 		i_assert(*importer->cur_guid == '\0');
+		if (change->type == DSYNC_MAIL_CHANGE_TYPE_EXPUNGE) {
+			/* the message was already expunged, so we don't know
+			   its header. return "unknown". */
+			return -1;
+		}
 		i_error("Mailbox %s: GUIDs not supported, "
 			"sync with header hashes instead",
 			mailbox_get_vname(importer->box));