lda-sieve plugin: Do not execute the sieve_discard script when an err…

…or occurs.
dovecot · Apr 10, 2018 · 8f78497 · 8f78497
1 parent f5cef47
commit 8f78497
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/plugins/lda-sieve/lda-sieve-plugin.c b/src/plugins/lda-sieve/lda-sieve-plugin.c
@@ -424,6 +424,8 @@ lda_sieve_execute_script(struct lda_sieve_run_context *srctx,
 	bool debug = srctx->mdctx->dest_user->mail_debug;
 	bool user_script, more;
 
+	*error_r = SIEVE_ERROR_NONE;
+
 	user_script = ( script == srctx->user_script );
 
 	if ( user_script ) {
@@ -569,6 +571,8 @@ static int lda_sieve_execute_scripts
 				/* End of normal script sequence */
 				break;
 			}
+		} else if ( error != SIEVE_ERROR_NONE ) {
+			break;
 		} else if ( sieve_multiscript_will_discard(mscript) &&
 			srctx->discard_script != NULL ) {
 			/* Mail is set to be discarded, but we have a discard script. */