dovecot-2.2-pigeonhole: lib-sieve: Made sure that quota errors n...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/c1aa38bff3ad
changeset: 2178:c1aa38bff3ad
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Tue Dec 22 21:30:12 2015 +0100
description:
lib-sieve: Made sure that quota errors never get logged as errors in syslog.
Also improved handling of permission errors caused by ACL plugin.

diffstat:

 src/lib-sieve/sieve-actions.c |  15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 43e72b47b57c -r c1aa38bff3ad src/lib-sieve/sieve-actions.c
--- a/src/lib-sieve/sieve-actions.c	Tue Dec 22 21:29:14 2015 +0100
+++ b/src/lib-sieve/sieve-actions.c	Tue Dec 22 21:30:12 2015 +0100
@@ -636,13 +636,20 @@
 		errstr = trans->error;
 		error_code = trans->error_code;
 
-		if ( error_code == MAIL_ERROR_NOTFOUND ||
+		if ( error_code == MAIL_ERROR_NOQUOTA ) {
+			/* Never log quota problems as error in global log */
+			sieve_result_global_log_error(aenv,
+				"failed to store into mailbox %s: %s",
+				mailbox_name, errstr);
+		} else if ( error_code == MAIL_ERROR_NOTFOUND ||
 			error_code == MAIL_ERROR_PARAMS ||
-			error_code == MAIL_ERROR_NOQUOTA ) {
-			sieve_result_error(aenv, "failed to store into mailbox %s: %s",
+			error_code == MAIL_ERROR_PERM ) {
+			sieve_result_error(aenv,
+				"failed to store into mailbox %s: %s",
 				mailbox_name, errstr);
 		} else {
-			sieve_result_global_error(aenv, "failed to store into mailbox %s: %s",
+			sieve_result_global_error(aenv,
+				"failed to store into mailbox %s: %s",
 				mailbox_name, errstr);
 		}