From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 6 Feb 2018 13:10:48 +0000 (+0200)
Subject: lib-storage: Set mailbox_transaction_context.flags earlier
X-Git-Tag: 2.3.9~2357
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c2e7ad9c45936aa07cbc9daadf168c362f34a77;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Set mailbox_transaction_context.flags earlier

Set it in index_transaction_init() so plugins' transaction_begin() methods
see it after calling super.transaction_begin().
---

diff --git a/src/lib-storage/index/index-transaction.c b/src/lib-storage/index/index-transaction.c
index 4b8565d154..2aa6fbebd0 100644
--- a/src/lib-storage/index/index-transaction.c
+++ b/src/lib-storage/index/index-transaction.c
@@ -162,6 +162,7 @@ void index_transaction_init(struct mailbox_transaction_context *t,
 	if ((flags & MAILBOX_TRANSACTION_FLAG_REFRESH) != 0)
 		mail_index_refresh(box->index);
 
+	t->flags = flags;
 	t->box = box;
 	t->reason = i_strdup(reason);
 	t->itrans = mail_index_transaction_begin(box->view, itrans_flags);
diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index d317685373..692cb4520e 100644
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -2147,7 +2147,6 @@ mailbox_transaction_begin(struct mailbox *box,
 	box->transaction_count++;
 	trans = box->v.transaction_begin(box, flags, reason);
 	i_assert(trans->reason != NULL);
-	trans->flags = flags;
 	return trans;
 }