From: Timo Sirainen <tss@iki.fi>
Date: Mon, 20 Apr 2009 16:35:32 +0000 (-0400)
Subject: Maildir++ quota: Recalculation was broken if limits were defined by maildirsize file... 
X-Git-Tag: 2.0.alpha1~912
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f018a85c93145e789ea5365718cfc6dd954a913;p=thirdparty%2Fdovecot%2Fcore.git

Maildir++ quota: Recalculation was broken if limits were defined by maildirsize file (and not quota_rules).

--HG--
branch : HEAD
---

diff --git a/src/plugins/quota/quota-maildir.c b/src/plugins/quota/quota-maildir.c
index a493f5bc34..1287e9d524 100644
--- a/src/plugins/quota/quota-maildir.c
+++ b/src/plugins/quota/quota-maildir.c
@@ -642,7 +642,9 @@ static int maildirquota_refresh(struct maildir_quota_root *root)
 		ret = maildirsize_read(root);
 	} T_END;
 	if (ret == 0) {
-		if (root->root.set->default_rule.bytes_limit == 0 &&
+		if (root->root.bytes_limit == 0 &&
+		    root->root.count_limit == 0 &&
+		    root->root.set->default_rule.bytes_limit == 0 &&
 		    root->root.set->default_rule.count_limit == 0) {
 			/* no quota */
 			if (!root->root.set->force_default_rule)