dovecot-2.2-pigeonhole: lib-sieve: made action limit error messa...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/b25d4208949f
changeset: 1647:b25d4208949f
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Mon Aug 06 23:14:19 2012 +0200
description:
lib-sieve: made action limit error messages more verbose.

diffstat:

 src/lib-sieve/sieve-result.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (28 lines):

diff -r bb8a9332e3d5 -r b25d4208949f src/lib-sieve/sieve-result.c
--- a/src/lib-sieve/sieve-result.c	Sun Aug 05 18:42:12 2012 +0200
+++ b/src/lib-sieve/sieve-result.c	Mon Aug 06 23:14:19 2012 +0200
@@ -554,17 +554,19 @@
 	}
 
 	/* Check policy limit on total number of actions */
-	if ( svinst->max_actions > 0 && result->action_count >= svinst->max_actions ) 
+	if ( svinst->max_actions > 0 && result->action_count >= svinst->max_actions )
 		{
-		sieve_runtime_error(renv, action.location, 
-			"total number of actions exceeds policy limit");
+		sieve_runtime_error(renv, action.location,
+			"total number of actions exceeds policy limit (%u > %u)",
+			result->action_count+1, svinst->max_actions);
 		return -1;
 	}
 
 	/* Check policy limit on number of this class of actions */
 	if ( instance_limit > 0 && instance_count >= instance_limit ) {
-		sieve_runtime_error(renv, action.location, 
-			"number of %s actions exceeds policy limit", act_def->name);
+		sieve_runtime_error(renv, action.location,
+			"number of %s actions exceeds policy limit (%u > %u)",
+			act_def->name, instance_count+1, instance_limit);
 		return -1;
 	}