Use dsn_from for success-DSN messages. Bug 2404

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 52fcc8284a2eb5f2e8e2877f3412992008d13164..f9a14b678df39b82c4c1ab84a6624023b7ff4f65 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -128,6 +128,9 @@ JH/26 The PIPE_CONNECT facility is promoted from experimental status and is now
       controlled by the build-time option SUPPORT_PIPE_CONNECT.
 
 PP/01 Unbreak heimdal_gssapi, broken in 4.92.
+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 dc2e577dd33ca34b9e0b55b00999cdc5c67b1e64..ada042a24e935e6579bbdc33ccfe10120733862a 100644 (file)
--- 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)