From: Timo Sirainen <tss@iki.fi>
Date: Fri, 31 Oct 2008 15:44:54 +0000 (+0200)
Subject: ACL: If a subscribed mailbox doesn't have list right, show it as non-existing.
X-Git-Tag: 1.2.alpha4~128
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b219481c3b695a18ba5801aa4843cf4d532dd86;p=thirdparty%2Fdovecot%2Fcore.git

ACL: If a subscribed mailbox doesn't have list right, show it as non-existing.

--HG--
branch : HEAD
---

diff --git a/src/plugins/acl/acl-mailbox-list.c b/src/plugins/acl/acl-mailbox-list.c
index 4349ce3ad3..d31af87ad2 100644
--- a/src/plugins/acl/acl-mailbox-list.c
+++ b/src/plugins/acl/acl-mailbox-list.c
@@ -177,9 +177,9 @@ acl_mailbox_list_iter_get_name(struct mailbox_list_iterate_context *ctx,
 }
 
 static int
-acl_mailbox_list_info_is_visible(struct acl_mailbox_list_iterate_context *ctx,
-				 const struct mailbox_info *info)
+acl_mailbox_list_info_is_visible(struct acl_mailbox_list_iterate_context *ctx)
 {
+	struct mailbox_info *info = &ctx->info;
 	const char *acl_name;
 	int ret;
 
@@ -196,14 +196,9 @@ acl_mailbox_list_info_is_visible(struct acl_mailbox_list_iterate_context *ctx,
 		return ret;
 
 	/* no permission to see this mailbox */
-	if ((ctx->info.flags & MAILBOX_SUBSCRIBED) != 0) {
+	if ((info->flags & MAILBOX_SUBSCRIBED) != 0) {
 		/* it's subscribed, show it as non-existent */
-		if (info != &ctx->info) {
-			ctx->info = *info;
-			info = &ctx->info;
-		}
-		ctx->info.flags = MAILBOX_NONEXISTENT |
-			MAILBOX_SUBSCRIBED;
+		info->flags = MAILBOX_NONEXISTENT | MAILBOX_SUBSCRIBED;
 		return 1;
 	}
 	return 0;
@@ -218,8 +213,9 @@ acl_mailbox_list_iter_next(struct mailbox_list_iterate_context *_ctx)
 	int ret;
 
 	while ((info = acl_mailbox_list_iter_next_info(ctx)) != NULL) {
+		ctx->info = *info;
 		T_BEGIN {
-			ret = acl_mailbox_list_info_is_visible(ctx, info);
+			ret = acl_mailbox_list_info_is_visible(ctx);
 		} T_END;
 		if (ret > 0)
 			break;
@@ -229,7 +225,7 @@ acl_mailbox_list_iter_next(struct mailbox_list_iterate_context *_ctx)
 		}
 		/* skip to next one */
 	}
-	return info;
+	return &ctx->info;
 }
 
 static int