From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Sun, 6 Nov 2016 00:33:04 +0000 (+0100)
Subject: lib-lda: mail-send: Compose var_expand table only once.
X-Git-Tag: 2.3.0.rc1~1664
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eec5a564abd206170836fc14e87073b31577c48e;p=thirdparty%2Fdovecot%2Fcore.git

lib-lda: mail-send: Compose var_expand table only once.
---

diff --git a/src/lib-lda/mail-send.c b/src/lib-lda/mail-send.c
index b3768b11bf..c0622097a7 100644
--- a/src/lib-lda/mail-send.c
+++ b/src/lib-lda/mail-send.c
@@ -51,6 +51,7 @@ int mail_send_rejection(struct mail_deliver_context *ctx, const char *recipient,
 	struct ostream *output;
 	const char *return_addr, *hdr;
 	const char *value, *msgid, *orig_msgid, *boundary, *error;
+	const struct var_expand_table *vtable;
 	string_t *str;
 	int ret;
 
@@ -78,6 +79,8 @@ int mail_send_rejection(struct mail_deliver_context *ctx, const char *recipient,
 			return_addr, str_sanitize(reason, 512));
 	}
 
+	vtable = get_var_expand_table(mail, reason, recipient);
+
 	smtp_client = smtp_client_init(ctx->set, NULL);
 	smtp_client_add_rcpt(smtp_client, return_addr);
 	output = smtp_client_send(smtp_client);
@@ -99,7 +102,7 @@ int mail_send_rejection(struct mail_deliver_context *ctx, const char *recipient,
 		boundary);
 	str_append(str, "Subject: ");
 	if (var_expand(str, ctx->set->rejection_subject,
-	    get_var_expand_table(mail, reason, recipient), &error) <= 0) {
+		vtable, &error) <= 0) {
 		i_error("Failed to expand rejection_subject=%s: %s",
 			ctx->set->rejection_subject, error);
 	}
@@ -116,7 +119,7 @@ int mail_send_rejection(struct mail_deliver_context *ctx, const char *recipient,
 	str_append(str, "Content-Transfer-Encoding: 8bit\r\n\r\n");
 
 	if (var_expand(str, ctx->set->rejection_reason,
-	    get_var_expand_table(mail, reason, recipient), &error) <= 0) {
+		vtable, &error) <= 0) {
 		i_error("Failed to expand rejection_reason=%s: %s",
 			ctx->set->rejection_reason, error);
 	}