dovecot-2.2-pigeonhole: lib-sieve: Fixed handling of global erro...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/43e72b47b57c
changeset: 2177:43e72b47b57c
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Tue Dec 22 21:29:14 2015 +0100
description:
lib-sieve: Fixed handling of global errors. If master and user error handler were identical, in some cases the log message could be lost.

diffstat:

 src/lib-sieve/sieve-error.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r 033a318a0fea -r 43e72b47b57c src/lib-sieve/sieve-error.c
--- a/src/lib-sieve/sieve-error.c	Tue Dec 22 21:28:17 2015 +0100
+++ b/src/lib-sieve/sieve-error.c	Tue Dec 22 21:29:14 2015 +0100
@@ -96,9 +96,9 @@
 				}
 			}
 			va_end(args_copy);
+			if (svinst->system_ehandler == ehandler)
+				return;
 		}
-		if (svinst->system_ehandler == ehandler)
-			return;
 	}
 
 	if ( ehandler == NULL )
@@ -138,9 +138,9 @@
 				}
 			}
 			va_end(args_copy);
+			if (svinst->system_ehandler == ehandler)
+				return;
 		}
-		if (svinst->system_ehandler == ehandler)
-			return;
 	}
 
 	if ( ehandler == NULL )