dovecot-2.2: dsync: Assert-crashfix for handling conflicting pri...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/7f5c29a81f03
changeset: 15841:7f5c29a81f03
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Feb 19 09:45:12 2013 +0200
description:
dsync: Assert-crashfix for handling conflicting private flags.

diffstat:

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

diffs (12 lines):

diff -r c79e5ff5e30d -r 7f5c29a81f03 src/doveadm/dsync/dsync-mailbox-import.c
--- a/src/doveadm/dsync/dsync-mailbox-import.c	Tue Feb 19 09:35:10 2013 +0200
+++ b/src/doveadm/dsync/dsync-mailbox-import.c	Tue Feb 19 09:45:12 2013 +0200
@@ -562,7 +562,7 @@
 		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;