dsync: Assert-crashfix for handling conflicting private flags.

diff --git a/src/doveadm/dsync/dsync-mailbox-import.c b/src/doveadm/dsync/dsync-mailbox-import.c
index 42818445cb0187dc2b55d7529f29f49afe90f13c..ea63486231fea5bd89a31297edd46d790ee9e1c7 100644 (file)
--- a/src/doveadm/dsync/dsync-mailbox-import.c
+++ b/src/doveadm/dsync/dsync-mailbox-import.c
@@ -562,7 +562,7 @@ merge_flags(uint32_t local_final, uint32_t local_add, uint32_t local_remove,
                else
                        remote_remove &= ~conflict_pvt_flags;
        }
-       conflict_flags = (local_remove & remote_add) & ~pvt_mask;
+       conflict_flags = local_remove & remote_add;
        if (conflict_flags != 0) {
                conflict_pvt_flags = conflict_flags & pvt_mask;
                conflict_flags &= ~pvt_mask;