dovecot-2.2-pigeonhole: LDA Sieve plugin: Made sure there is alw...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/37ddc42c007c
changeset: 2175:37ddc42c007c
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Mon Dec 21 23:51:55 2015 +0100
description:
LDA Sieve plugin: Made sure there is always a proper error handler for the implicit keep action during multiscript execution.
Should fix reported bug on missing message-ID in log.

diffstat:

 src/plugins/lda-sieve/lda-sieve-plugin.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (15 lines):

diff -r 8a007623cc89 -r 37ddc42c007c src/plugins/lda-sieve/lda-sieve-plugin.c
--- a/src/plugins/lda-sieve/lda-sieve-plugin.c	Mon Dec 21 23:32:49 2015 +0100
+++ b/src/plugins/lda-sieve/lda-sieve-plugin.c	Mon Dec 21 23:51:55 2015 +0100
@@ -601,8 +601,10 @@
 	}
 
 	/* Finish execution */
+	exec_ehandler = (srctx->user_ehandler != NULL ?
+		srctx->user_ehandler : srctx->master_ehandler);
 	action_ehandler = lda_sieve_log_ehandler_create
-		(srctx->user_ehandler, mdctx);
+		(exec_ehandler, mdctx);
 	if ( compile_error && error == SIEVE_ERROR_TEMP_FAILURE )
 		ret = sieve_multiscript_tempfail(&mscript, action_ehandler);
 	else