Maildir++ quota: Recalculation was broken if limits were defined by maildirsize file...

--HG--
branch : HEAD

diff --git a/src/plugins/quota/quota-maildir.c b/src/plugins/quota/quota-maildir.c
index a493f5bc34ce40fd4c7673729d3622ae779db5e0..1287e9d5243f500b84c6880ff598618a9ec3a98f 100644 (file)
--- 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)