Change auto-generated to auto-replied, in line with RFC 3834.

3 files changed, 40 insertions, 9 deletions

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index adf73796b..2215122b5 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.257 2005/11/14 11:41:23 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.258 2005/11/14 13:56:49 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -88,6 +88,37 @@ PH/09 Applied a patch from the Sieve maintainer which:
          multiple envelope elements, the last element determinted the
          result)
 
+PH/10 Exim was violating RFC 3834 ("Recommendations for Automatic Responses to
+      Electronic Mail") by including:
+
+        Auto-submitted: auto-generated
+
+      in the messages that it generates (bounce messages and others, such as
+      warnings). In the case of bounce messages for non-SMTP mesages, there was
+      also a typo: it was using "Auto_submitted" (underscore instead of
+      hyphen). Since every message generated by Exim is necessarily in response
+      to another message, thes have all been changed to:
+
+        Auto-Submitted: auto-replied
+
+      in accordance with these statements in the RFC:
+
+        The auto-replied keyword:
+
+        -  SHOULD be used on messages sent in direct response to another
+           message by an automatic process,
+
+        -  MUST NOT be used on manually-generated messages,
+
+        -  MAY be used on Delivery Status Notifications (DSNs) and Message
+           Disposition Notifications (MDNs),
+
+        -  MUST NOT be used on messages generated by automatic or periodic
+           processes, except for messages which are automatic responses to
+           other messages.
+
+
+
 
 Exim version 4.54
 -----------------
diff --git a/src/src/deliver.c b/src/src/deliver.c
index c166d2601..83a3d1ad4 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/deliver.c,v 1.22 2005/08/02 11:22:24 ph10 Exp $ */
+/* $Cambridge: exim/src/src/deliver.c,v 1.23 2005/11/14 13:56:49 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -1991,7 +1991,7 @@ if (addr->special_action == SPECIAL_WARN &&
 
       if (errors_reply_to != NULL)
         fprintf(f, "Reply-To: %s\n", errors_reply_to);
-      fprintf(f, "Auto-Submitted: auto-generated\n");
+      fprintf(f, "Auto-Submitted: auto-replied\n");
       fprintf(f, "From: Mail Delivery System <Mailer-Daemon@%s>\n",
         qualify_domain_sender);
       fprintf(f, "%s", CS warn_message);
@@ -6177,7 +6177,7 @@ while (addr_failed != NULL)
 
       if (errors_reply_to != NULL)
         fprintf(f, "Reply-To: %s\n", errors_reply_to);
-      fprintf(f, "Auto-Submitted: auto-generated\n");
+      fprintf(f, "Auto-Submitted: auto-replied\n");
       fprintf(f, "From: Mail Delivery System <Mailer-Daemon@%s>\n",
         qualify_domain_sender);
       fprintf(f, "To: %s\n", bounce_recipient);
@@ -6699,7 +6699,7 @@ else if (addr_defer != (address_item *)(+1))
 
         if (errors_reply_to != NULL)
           fprintf(f, "Reply-To: %s\n", errors_reply_to);
-        fprintf(f, "Auto-Submitted: auto-generated\n");
+        fprintf(f, "Auto-Submitted: auto-replied\n");
         fprintf(f, "From: Mail Delivery System <Mailer-Daemon@%s>\n",
           qualify_domain_sender);
         fprintf(f, "To: %s\n", recipients);
diff --git a/src/src/moan.c b/src/src/moan.c
index acf701aec..f1d08bde1 100644
--- a/src/src/moan.c
+++ b/src/src/moan.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/moan.c,v 1.3 2005/06/27 14:29:43 ph10 Exp $ */
+/* $Cambridge: exim/src/src/moan.c,v 1.4 2005/11/14 13:56:49 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -61,7 +61,7 @@ else DEBUG(D_any) debug_printf("Child process %d for sending message\n", pid);
 
 f = fdopen(fd, "wb");
 if (errors_reply_to != NULL) fprintf(f, "Reply-To: %s\n", errors_reply_to);
-fprintf(f, "Auto_submitted: auto-generated\n");
+fprintf(f, "Auto-Submitted: auto-replied\n");
 fprintf(f, "From: Mail Delivery System <Mailer-Daemon@%s>\n",
   qualify_domain_sender);
 fprintf(f, "To: %s\n", recipient);
@@ -414,7 +414,7 @@ if (pid < 0)
   }
 
 f = fdopen(fd, "wb");
-fprintf(f, "Auto_submitted: auto-generated\n");
+fprintf(f, "Auto-Submitted: auto-replied\n");
 fprintf(f, "From: Mail Delivery System <Mailer-Daemon@%s>\n",
   qualify_domain_sender);
 fprintf(f, "To: %s\n", who);
@@ -658,7 +658,7 @@ if (pid < 0)
   }
 
 f = fdopen(fd, "wb");
-fprintf(f, "Auto_submitted: auto-generated\n");
+fprintf(f, "Auto-Submitted: auto-replied\n");
 fprintf(f, "From: Mail Delivery System <Mailer-Daemon@%s>\n",
   qualify_domain_sender);
 fprintf(f, "To: %s\n", s);