dovecot-1.2: Fixed OPEN_IGNORE_ACLS flag to work again with imap...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/633f5ff81767
changeset: 8429:633f5ff81767
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Nov 16 16:29:47 2008 +0200
description:
Fixed OPEN_IGNORE_ACLS flag to work again with imap-acl plugin.

diffstat:

2 files changed, 11 insertions(+), 11 deletions(-)
src/plugins/acl/acl-mailbox.c |   20 +++++++++++---------
src/plugins/acl/acl-storage.c |    2 --

diffs (42 lines):

diff -r 1b7c0a216663 -r 633f5ff81767 src/plugins/acl/acl-mailbox.c
--- 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 @@ struct mailbox *acl_mailbox_open_box(str
 	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;
 }
diff -r 1b7c0a216663 -r 633f5ff81767 src/plugins/acl/acl-storage.c
--- a/src/plugins/acl/acl-storage.c	Sun Nov 16 15:20:45 2008 +0200
+++ b/src/plugins/acl/acl-storage.c	Sun Nov 16 16:29:47 2008 +0200
@@ -131,8 +131,6 @@ acl_mailbox_open(struct mail_storage *st
 	if (box == NULL)
 		return NULL;
 
-	if ((flags & MAILBOX_OPEN_IGNORE_ACLS) != 0)
-		return box;
 	return acl_mailbox_open_box(box);
 }