From: Timo Sirainen <tss@iki.fi>
Date: Wed, 29 Oct 2008 16:41:56 +0000 (+0200)
Subject: Quota: If mail_debug=yes, log when quota warning script is executed.
X-Git-Tag: 1.2.alpha4~137
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b40d1ef77181fda648e2ba22188c91a124f5bee6;p=thirdparty%2Fdovecot%2Fcore.git

Quota: If mail_debug=yes, log when quota warning script is executed.

--HG--
branch : HEAD
---

diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c
index 4ce1687e24..8a2604afd2 100644
--- a/src/plugins/quota/quota.c
+++ b/src/plugins/quota/quota.c
@@ -773,10 +773,14 @@ static int quota_transaction_set_limits(struct quota_transaction_context *ctx)
 	return 0;
 }
 
-static void quota_warning_execute(const char *cmd)
+static void quota_warning_execute(struct quota_root *root, const char *cmd)
 {
-	int ret = system(cmd);
+	int ret;
+
+	if (root->quota->set->debug)
+		i_info("quota: Executing warning: %s", cmd);
 
+	ret = system(cmd);
 	if (ret < 0) {
 		i_error("system(%s) failed: %m", cmd);
 	} else if (WIFSIGNALED(ret)) {
@@ -813,7 +817,7 @@ static void quota_warnings_execute(struct quota_transaction_context *ctx,
 		     bytes_current >= (uint64_t)warnings[i].rule.bytes_limit) ||
 		    (count_before < (uint64_t)warnings[i].rule.count_limit &&
 		     count_current >= (uint64_t)warnings[i].rule.count_limit)) {
-			quota_warning_execute(warnings[i].command);
+			quota_warning_execute(root, warnings[i].command);
 			break;
 		}
 	}