dsync: Do not try replace remote folder GUID when doing oneway sync

Oneway sync tried to replace remote folder's GUID when
running in one way mode. This causes trouble, e.g.
when running with imapc, because you can't do this.

diff --git a/src/doveadm/dsync/dsync-brain-mailbox-tree-sync.c b/src/doveadm/dsync/dsync-brain-mailbox-tree-sync.c
index 60d429849b2702e51a78a8d7e1b8585a47a2b272..5d67c694703fcf3b989325b13f9b90e3e36d5500 100644 (file)
--- a/src/doveadm/dsync/dsync-brain-mailbox-tree-sync.c
+++ b/src/doveadm/dsync/dsync-brain-mailbox-tree-sync.c
@@ -57,7 +57,14 @@ sync_create_box(struct dsync_brain *brain, struct mailbox *box,
        }
 
        ret = memcmp(mailbox_guid, metadata.guid, sizeof(metadata.guid));
-       if (ret > 0) {
+
+       /* if THEIR guid is bigger than OUR guid, and we are not doing
+          backup in either direction, OR GUID did not match and we are
+          receiving backup, try change the mailbox GUID.
+       */
+
+       if ((ret > 0 && !brain->backup_recv &&
+            !brain->backup_send) || (ret != 0 && brain->backup_recv)) {
                if (brain->debug) {
                        i_debug("brain %c: Changing mailbox %s GUID %s -> %s",
                                brain->master_brain ? 'M' : 'S',