From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 9 Aug 2017 10:17:15 +0000 (+0300)
Subject: dsync: Add missing transaction flags when performing UID renumbering
X-Git-Tag: 2.2.34~172
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fef90ec2c697132396b3bc01d10ec42b996f2dec;p=thirdparty%2Fdovecot%2Fcore.git

dsync: Add missing transaction flags when performing UID renumbering

The transaction didn't have MAILBOX_TRANSACTION_FLAG_SYNC or
MAILBOX_TRANSACTION_FLAG_NO_NOTIFY (with DSYNC_BRAIN_FLAG_NO_NOTIFY).

This caused replication-dsync to unnecessarily trigger another dsync
replication notification.
---

diff --git a/src/doveadm/dsync/dsync-mailbox-import.c b/src/doveadm/dsync/dsync-mailbox-import.c
index ef4ed333ee..2d5879e769 100644
--- a/src/doveadm/dsync/dsync-mailbox-import.c
+++ b/src/doveadm/dsync/dsync-mailbox-import.c
@@ -2594,6 +2594,7 @@ reassign_uids_in_seq_range(struct dsync_mailbox_importer *importer,
 {
 	struct mailbox *box = importer->box;
 	const enum mailbox_transaction_flags trans_flags =
+		importer->transaction_flags |
 		MAILBOX_TRANSACTION_FLAG_EXTERNAL |
 		MAILBOX_TRANSACTION_FLAG_ASSIGN_UIDS;
 	struct mailbox_transaction_context *trans;