lib-lda: Code cleanup - remove unnecessary dest_mail check

diff --git a/src/lib-lda/mail-deliver.c b/src/lib-lda/mail-deliver.c
index c881a343db4be380094295e710b11c0840a77986..1fb070fc3f8aa40b2fdf9f2d7a4be3f20e7955d7 100644 (file)
--- a/src/lib-lda/mail-deliver.c
+++ b/src/lib-lda/mail-deliver.c
@@ -114,11 +114,11 @@ const struct var_expand_table *
 mail_deliver_ctx_get_log_var_expand_table(struct mail_deliver_context *ctx,
                                          const char *message)
 {
-       struct mail *mail = ctx->dest_mail != NULL ?
-               ctx->dest_mail : ctx->src_mail;
        unsigned int delivery_time_msecs;
 
-       mail_deliver_log_update_cache(ctx, mail);
+       /* If a mail was saved/copied, the cache is already filled and the
+          following call is ignored. Otherwise, only the source mail exists. */
+       mail_deliver_log_update_cache(ctx, ctx->src_mail);
        /* This call finishes a mail delivery. With Sieve there may be multiple
           mail deliveries. */
        ctx->cache->filled = FALSE;