From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 25 Apr 2016 11:35:21 +0000 (+0300)
Subject: dsync: If full resync is requested, return empty state string.
X-Git-Tag: 2.3.0.rc1~3946
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d49dc64d;p=thirdparty%2Fdovecot%2Fcore.git

dsync: If full resync is requested, return empty state string.

If the state is wrong, it's better to fully resync all the mailboxes rather
than just the one where a problem was noticed.
---

diff --git a/src/doveadm/dsync/dsync-brain.c b/src/doveadm/dsync/dsync-brain.c
index 915d4f23f7..3191708ead 100644
--- a/src/doveadm/dsync/dsync-brain.c
+++ b/src/doveadm/dsync/dsync-brain.c
@@ -705,6 +705,9 @@ void dsync_brain_get_state(struct dsync_brain *brain, string_t *output)
 	const uint8_t *guid_p;
 	uint8_t *guid;
 
+	if (brain->require_full_resync)
+		return;
+
 	/* update mailbox states */
 	array_foreach(&brain->remote_mailbox_states, new_state) {
 		guid_p = new_state->mailbox_guid;