From: Timo Sirainen <tss@iki.fi>
Date: Fri, 16 Sep 2011 09:40:19 +0000 (+0300)
Subject: quota: When matching mailbox names in quota rules, unalias namespaces first.
X-Git-Tag: 2.1.alpha2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b089505afb8b5c5dfb43ef88af0ea7e0920db587;p=thirdparty%2Fdovecot%2Fcore.git

quota: When matching mailbox names in quota rules, unalias namespaces first.
---

diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c
index e67a501820..ba55bd254c 100644
--- a/src/plugins/quota/quota.c
+++ b/src/plugins/quota/quota.c
@@ -604,6 +604,8 @@ static int quota_root_get_rule_limits(struct quota_root *root,
 	   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 @@ int quota_transaction_commit(struct quota_transaction_context **_ctx)
 		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++) {