From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Thu, 14 Sep 2017 23:15:19 +0000 (+0200)
Subject: lib-lda: Use SMTP submit settings directly.
X-Git-Tag: 2.3.0.rc1~921
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d9b33dc0195e52a430a6264569b4a6eb36babdc;p=thirdparty%2Fdovecot%2Fcore.git

lib-lda: Use SMTP submit settings directly.
---

diff --git a/src/lib-lda/mail-send.c b/src/lib-lda/mail-send.c
index 371687b9cb..af936bf8d3 100644
--- a/src/lib-lda/mail-send.c
+++ b/src/lib-lda/mail-send.c
@@ -47,7 +47,6 @@ int mail_send_rejection(struct mail_deliver_context *ctx, const char *recipient,
 {
 	struct mail *mail = ctx->src_mail;
 	struct istream *input;
-	struct smtp_submit_settings smtp_set;
 	struct smtp_submit *smtp_submit;
 	struct ostream *output;
 	const char *return_addr, *hdr;
@@ -82,12 +81,7 @@ int mail_send_rejection(struct mail_deliver_context *ctx, const char *recipient,
 
 	vtable = get_var_expand_table(mail, reason, recipient);
 
-	i_zero(&smtp_set);
-	smtp_set.hostname = ctx->set->hostname;
-	smtp_set.submission_host = ctx->set->submission_host;
-	smtp_set.sendmail_path = ctx->set->sendmail_path;
-
-	smtp_submit = smtp_submit_init_simple(&smtp_set, NULL);
+	smtp_submit = smtp_submit_init_simple(ctx->smtp_set, NULL);
 	smtp_submit_add_rcpt(smtp_submit, return_addr);
 	output = smtp_submit_send(smtp_submit);