From be19951969fd47ecf070f4c869ccd7856d885777 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Tue, 22 Dec 2015 21:29:14 +0100
Subject: [PATCH] lib-sieve: Fixed handling of global errors. If master and
 user error handler were identical, in some cases the log message could be
 lost.

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

diff --git a/src/lib-sieve/sieve-error.c b/src/lib-sieve/sieve-error.c
index 6b6d391d9..e9f99124c 100644
--- a/src/lib-sieve/sieve-error.c
+++ b/src/lib-sieve/sieve-error.c
@@ -96,9 +96,9 @@ void sieve_direct_verror
 				}
 			}
 			va_end(args_copy);
+			if (svinst->system_ehandler == ehandler)
+				return;
 		}
-		if (svinst->system_ehandler == ehandler)
-			return;
 	}
 
 	if ( ehandler == NULL )
@@ -138,9 +138,9 @@ void sieve_direct_vwarning
 				}
 			}
 			va_end(args_copy);
+			if (svinst->system_ehandler == ehandler)
+				return;
 		}
-		if (svinst->system_ehandler == ehandler)
-			return;
 	}
 
 	if ( ehandler == NULL )
-- 
GitLab