Mercurial > dovecot > core-2.2

changeset 12305:0908326bf4b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
acl: Recent change broke setting acls.
author Timo Sirainen <tss@iki.fi>
date Mon, 18 Oct 2010 19:00:59 +0100
parents 6c2d5ed0b664
children d95510ee0c8f
files src/plugins/acl/acl-mailbox.c
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/plugins/acl/acl-mailbox.c	Mon Oct 18 18:30:42 2010 +0100
+++ b/src/plugins/acl/acl-mailbox.c	Mon Oct 18 19:00:59 2010 +0100
@@ -510,15 +510,17 @@
 	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;