diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2019-06-04 18:13:21 +0100 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2019-09-29 00:29:30 +0200 |
| commit | e5b326289c172c290fca5e8f492187aeddce9291 (patch) | |
| tree | dcde6bdd46324dcfd4a20dafc9068a3e4f99ce1f | |
| parent | 94d64a731f0da6988ca7d130b4dffa00449ff087 (diff) | |
| download | exim4-e5b326289c172c290fca5e8f492187aeddce9291.tar.gz | |
Use dsn_from for success-DSN messages. Bug 2404
(cherry picked from commit 87abcb247b4444bab5fd0bcb212ddb26d5fd9191)
(cherry picked from commit 454bab46ae6812e29652d10c390451c962a6f806)
(cherry picked from commit 9eebb5a0ed51584c18af8b08a27695b806980775)
(cherry picked from commit 09898a2fe75f7044f9f46bd01dcd0e2f22f61d0d)
| -rw-r--r-- | doc/doc-txt/ChangeLog | 4 | ||||
| -rw-r--r-- | src/src/deliver.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index f02b9b6ec..a3a6b9b39 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -76,6 +76,10 @@ JH/20 Bug 2389: fix server advertising of usable certificates, under GnuTLS in directory-of-certs mode. Previously they were advertised despite the documentation. +JH/27 Bug 2404: Use the main-section configuration option "dsn_from" for + success-DSN messages. Previously the From: header was always the default + one for these; the option was ignored. + Exim version 4.92 ----------------- diff --git a/src/src/deliver.c b/src/src/deliver.c index e17994117..4720f596a 100644 --- a/src/src/deliver.c +++ b/src/src/deliver.c @@ -7365,8 +7365,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" @@ -7377,7 +7377,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) |