From: Timo Sirainen <tss@iki.fi>
Date: Wed, 16 Jun 2010 15:17:52 +0000 (+0100)
Subject: dict quota: Quota recalculation always doubled the quota with pgsql.
X-Git-Tag: 2.0.rc1~165
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8595bafebf582a04fdff49af3cc69919c5332a0d;p=thirdparty%2Fdovecot%2Fcore.git

dict quota: Quota recalculation always doubled the quota with pgsql.

--HG--
branch : HEAD
---

diff --git a/src/plugins/quota/quota-dict.c b/src/plugins/quota/quota-dict.c
index 083920aeda..b1c59dd507 100644
--- a/src/plugins/quota/quota-dict.c
+++ b/src/plugins/quota/quota-dict.c
@@ -115,6 +115,10 @@ dict_quota_count(struct dict_quota_root *root,
 
 	T_BEGIN {
 		dt = dict_transaction_begin(root->dict);
+		/* these unsets are mainly necessary for pgsql, because its
+		   trigger otherwise increases quota without deleting it */
+		dict_unset(dt, DICT_QUOTA_CURRENT_BYTES_PATH);
+		dict_unset(dt, DICT_QUOTA_CURRENT_COUNT_PATH);
 		dict_set(dt, DICT_QUOTA_CURRENT_BYTES_PATH, dec2str(bytes));
 		dict_set(dt, DICT_QUOTA_CURRENT_COUNT_PATH, dec2str(count));
 	} T_END;