From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Tue, 23 Jan 2018 09:37:41 +0000 (+0200)
Subject: acl: Fix ACL_CONTEXT check
X-Git-Tag: 2.3.9~2446
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8a3be58d25a5b9113a70b848f53e664edd63761;p=thirdparty%2Fdovecot%2Fcore.git

acl: Fix ACL_CONTEXT check

Was incorrect in 3131b3878de3245db7552234e66d437e8fde9351
---

diff --git a/src/plugins/acl/acl-mailbox.c b/src/plugins/acl/acl-mailbox.c
index b634215453..241ee3989f 100644
--- a/src/plugins/acl/acl-mailbox.c
+++ b/src/plugins/acl/acl-mailbox.c
@@ -442,7 +442,7 @@ static int
 acl_transaction_commit(struct mailbox_transaction_context *ctx,
 		       struct mail_transaction_commit_changes *changes_r)
 {
-	struct acl_mailbox *abox = ACL_CONTEXT(ctx->box);
+	struct acl_mailbox *abox = ACL_CONTEXT_REQUIRE(ctx->box);
 	void *at = ACL_CONTEXT(ctx);
 	int ret;
 
@@ -451,8 +451,6 @@ acl_transaction_commit(struct mailbox_transaction_context *ctx,
 		return -1;
 	}
 
-	i_assert(abox != NULL);
-
 	ret = abox->module_ctx.super.transaction_commit(ctx, changes_r);
 	if (abox->no_read_right) {
 		/* don't allow IMAP client to see what UIDs the messages got */