dovecot-1.2: Maildir++ quota: Recalculation was broken if limits...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/56732ef5ff96
changeset: 8969:56732ef5ff96
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Apr 20 12:35:32 2009 -0400
description:
Maildir++ quota: Recalculation was broken if limits were defined by maildirsize file (and not quota_rules).

diffstat:

1 file changed, 3 insertions(+), 1 deletion(-)
src/plugins/quota/quota-maildir.c |    4 +++-

diffs (14 lines):

diff -r 5317349a8dea -r 56732ef5ff96 src/plugins/quota/quota-maildir.c
--- a/src/plugins/quota/quota-maildir.c	Mon Apr 20 12:17:59 2009 -0400
+++ b/src/plugins/quota/quota-maildir.c	Mon Apr 20 12:35:32 2009 -0400
@@ -641,7 +641,9 @@ static int maildirquota_refresh(struct m
 		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)