diff --git a/src/plugins/imapsieve/imap-sieve.c b/src/plugins/imapsieve/imap-sieve.c index 19eac4493bab4d1e81aac4d8bdc26a9daf637c8e..f1b4106257ef9b847aeb888704ed18afa69e7444 100644 --- a/src/plugins/imapsieve/imap-sieve.c +++ b/src/plugins/imapsieve/imap-sieve.c @@ -695,14 +695,13 @@ int imap_sieve_run_mail /* Initialize trace logging */ + trace_log = NULL; if ( sieve_trace_config_get(svinst, &trace_config) >= 0) { const char *tr_label = t_strdup_printf ("%s.%s.%u", isieve->user->username, mailbox_get_vname(isrun->mailbox), mail->uid); - if ( sieve_trace_log_open(svinst, tr_label, &trace_log) < 0 ) { + if ( sieve_trace_log_open(svinst, tr_label, &trace_log) < 0 ) memset(&trace_config, 0, sizeof(trace_config)); - trace_log = NULL; - } } T_BEGIN { diff --git a/src/plugins/lda-sieve/lda-sieve-plugin.c b/src/plugins/lda-sieve/lda-sieve-plugin.c index bb5b0d7031a1e975e22daee5d8b0c120731aecb0..2effe5852c6b147de12823503c54117d67b8065a 100644 --- a/src/plugins/lda-sieve/lda-sieve-plugin.c +++ b/src/plugins/lda-sieve/lda-sieve-plugin.c @@ -807,11 +807,10 @@ static int lda_sieve_execute /* Initialize trace logging */ + trace_log = NULL; if ( sieve_trace_config_get(svinst, &trace_config) >= 0 && - sieve_trace_log_open(svinst, NULL, &trace_log) < 0 ) { + sieve_trace_log_open(svinst, NULL, &trace_log) < 0 ) memset(&trace_config, 0, sizeof(trace_config)); - trace_log = NULL; - } /* Collect necessary message data */