Mercurial > dovecot > original-hg > dovecot-1.2
changeset 8429:633f5ff81767 HEAD
Fixed OPEN_IGNORE_ACLS flag to work again with imap-acl plugin.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sun, 16 Nov 2008 16:29:47 +0200 |
| parents | 1b7c0a216663 |
| children | 23aee2534249 |
| files | src/plugins/acl/acl-mailbox.c src/plugins/acl/acl-storage.c |
| diffstat | 2 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/plugins/acl/acl-mailbox.c Sun Nov 16 15:20:45 2008 +0200 +++ b/src/plugins/acl/acl-mailbox.c Sun Nov 16 16:29:47 2008 +0200 @@ -354,15 +354,17 @@ abox->aclobj = acl_object_init_from_name(astorage->rights.backend, box->storage, mailbox_get_name(box)); - - box->v.is_readonly = acl_is_readonly; - box->v.allow_new_keywords = acl_allow_new_keywords; - box->v.close = acl_mailbox_close; - box->v.mail_alloc = acl_mail_alloc; - box->v.save_begin = acl_save_begin; - box->v.keywords_create = acl_keywords_create; - box->v.copy = acl_copy; - box->v.transaction_commit = acl_transaction_commit; + + if ((box->open_flags & MAILBOX_OPEN_IGNORE_ACLS) == 0) { + box->v.is_readonly = acl_is_readonly; + box->v.allow_new_keywords = acl_allow_new_keywords; + box->v.close = acl_mailbox_close; + box->v.mail_alloc = acl_mail_alloc; + box->v.save_begin = acl_save_begin; + box->v.keywords_create = acl_keywords_create; + box->v.copy = acl_copy; + box->v.transaction_commit = acl_transaction_commit; + } MODULE_CONTEXT_SET(box, acl_storage_module, abox); return box; }