From: Timo Sirainen <tss@iki.fi>
Date: Mon, 18 Oct 2010 18:00:59 +0000 (+0100)
Subject: acl: Recent change broke setting acls.
X-Git-Tag: 2.0.6~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd350fbefc91e6450dcd01f0cda5db6ea2242736;p=thirdparty%2Fdovecot%2Fcore.git

acl: Recent change broke setting acls.
---

diff --git a/src/plugins/acl/acl-mailbox.c b/src/plugins/acl/acl-mailbox.c
index 182a730c93..128fe2c79d 100644
--- a/src/plugins/acl/acl-mailbox.c
+++ b/src/plugins/acl/acl-mailbox.c
@@ -510,15 +510,17 @@ void acl_mailbox_allocated(struct mailbox *box)
 	abox = p_new(box->pool, struct acl_mailbox, 1);
 	abox->module_ctx.super = *v;
 	box->vlast = &abox->module_ctx.super;
+	/* aclobj can be used for setting ACLs, even when mailbox is opened
+	   with IGNORE_ACLS flag */
+	abox->aclobj = acl_object_init_from_name(alist->rights.backend,
+						 mailbox_get_name(box));
 
+	v->free = acl_mailbox_free;
 	if ((box->flags & MAILBOX_FLAG_IGNORE_ACLS) == 0) {
-		abox->aclobj = acl_object_init_from_name(alist->rights.backend,
-							 mailbox_get_name(box));
 		abox->acl_enabled = TRUE;
 		v->is_readonly = acl_is_readonly;
 		v->allow_new_keywords = acl_allow_new_keywords;
 		v->open = acl_mailbox_open;
-		v->free = acl_mailbox_free;
 		v->create = acl_mailbox_create;
 		v->update = acl_mailbox_update;
 		v->delete = acl_mailbox_delete;