From 2e86ce0239b4bc88c94d7edb5813d38ab080627e Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Tue, 19 Feb 2013 09:45:12 +0200 Subject: [PATCH] dsync: Assert-crashfix for handling conflicting private flags. --- src/doveadm/dsync/dsync-mailbox-import.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doveadm/dsync/dsync-mailbox-import.c b/src/doveadm/dsync/dsync-mailbox-import.c index 42818445cb..ea63486231 100644 --- 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; -- 2.47.3