dovecot-2.1: quota: When matching mailbox names in quota rules, ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/7f7dc4c89d04
changeset: 13466:7f7dc4c89d04
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Sep 16 12:40:19 2011 +0300
description:
quota: When matching mailbox names in quota rules, unalias namespaces first.

diffstat:

 src/plugins/quota/quota.c |  5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diffs (22 lines):

diff -r ff6272a52f0d -r 7f7dc4c89d04 src/plugins/quota/quota.c
--- a/src/plugins/quota/quota.c	Fri Sep 16 12:39:19 2011 +0300
+++ b/src/plugins/quota/quota.c	Fri Sep 16 12:40:19 2011 +0300
@@ -604,6 +604,8 @@
 	   ignore any specific quota rules */
 	enabled = bytes_limit != 0 || count_limit != 0;
 
+	(void)mail_namespace_find_unalias(root->quota->user->namespaces,
+					  &mailbox_name);
 	rule = enabled ? quota_root_rule_find(root->set, mailbox_name) : NULL;
 	if (rule != NULL) {
 		if (!rule->ignore) {
@@ -1093,6 +1095,9 @@
 		ARRAY_DEFINE(warn_roots, struct quota_root *);
 
 		mailbox_name = mailbox_get_vname(ctx->box);
+		(void)mail_namespace_find_unalias(
+			ctx->box->storage->user->namespaces, &mailbox_name);
+
 		roots = array_get(&ctx->quota->roots, &count);
 		t_array_init(&warn_roots, count);
 		for (i = 0; i < count; i++) {