summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2019-06-04 18:13:21 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2019-06-05 17:17:16 +0100
commit87abcb247b4444bab5fd0bcb212ddb26d5fd9191 (patch)
tree3eeb547504dd0cb676ae0cc4abe54ced382abbfb /src
parent6ee110613402e8562c03b4a11c3ffbdbd47bd153 (diff)
Use dsn_from for success-DSN messages. Bug 2404
Diffstat (limited to 'src')
-rw-r--r--src/src/deliver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/src/deliver.c b/src/src/deliver.c
index dc2e577dd..ada042a24 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -7342,8 +7342,8 @@ if (addr_senddsn)
if (errors_reply_to)
fprintf(f, "Reply-To: %s\n", errors_reply_to);
+ moan_write_from(f);
fprintf(f, "Auto-Submitted: auto-generated\n"
- "From: Mail Delivery System <Mailer-Daemon@%s>\n"
"To: %s\n"
"Subject: Delivery Status Notification\n"
"Content-Type: multipart/report; report-type=delivery-status; boundary=%s\n"
@@ -7354,7 +7354,7 @@ if (addr_senddsn)
"This message was created automatically by mail delivery software.\n"
" ----- The following addresses had successful delivery notifications -----\n",
- qualify_domain_sender, sender_address, bound, bound);
+ sender_address, bound, bound);
for (addr_dsntmp = addr_senddsn; addr_dsntmp;
addr_dsntmp = addr_dsntmp->next)