dovecot: Removed rights checking from mailbox_get_status(). The ...

dovecot at dovecot.org dovecot at dovecot.org
Sun Aug 12 16:28:45 EEST 2007


details:   http://hg.dovecot.org/dovecot/rev/ceab61d7c20a
changeset: 6269:ceab61d7c20a
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Aug 12 16:28:36 2007 +0300
description:
Removed rights checking from mailbox_get_status(). The rights were already
checked when mailbox was opened.

diffstat:

1 file changed, 23 deletions(-)
src/plugins/acl/acl-mailbox.c |   23 -----------------------

diffs (40 lines):

diff -r 2a79d23ad98f -r ceab61d7c20a src/plugins/acl/acl-mailbox.c
--- a/src/plugins/acl/acl-mailbox.c	Sun Aug 12 15:30:04 2007 +0300
+++ b/src/plugins/acl/acl-mailbox.c	Sun Aug 12 16:28:36 2007 +0300
@@ -86,28 +86,6 @@ static int acl_mailbox_close(struct mail
 
 	acl_object_deinit(&abox->aclobj);
 	return abox->module_ctx.super.close(box);
-}
-
-static int acl_mailbox_get_status(struct mailbox *box,
-				  enum mailbox_status_items items,
-				  struct mailbox_status *status)
-{
-	struct acl_mailbox *abox = ACL_CONTEXT(box);
-	int ret;
-
-	ret = mailbox_acl_right_lookup(box, ACL_STORAGE_RIGHT_READ);
-	if (ret < 0)
-		return -1;
-	if (ret == 0) {
-		/* No read rights. APPEND however wants to lookup keywords
-		   and we don't want to fail that lookup. We could fail or
-		   return empty keywords if user had no INSERT+WRITE rights,
-		   but don't bother. */
-		if (items != STATUS_KEYWORDS)
-			return -1;
-	}
-
-	return abox->module_ctx.super.get_status(box, items, status);
 }
 
 static int
@@ -299,7 +277,6 @@ struct mailbox *acl_mailbox_open_box(str
 	box->v.is_readonly = acl_is_readonly;
 	box->v.allow_new_keywords = acl_allow_new_keywords;
 	box->v.close = acl_mailbox_close;
-	box->v.get_status = acl_mailbox_get_status;
 	box->v.mail_alloc = acl_mail_alloc;
 	box->v.save_init = acl_save_init;
 	box->v.copy = acl_copy;


More information about the dovecot-cvs mailing list