In the default configuration, change the use of "message" to "add_header"

in "warn" statements.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 20eb6f83c4b33ea8296c41d532e30ac744a43c45..2ab45d79837435927c1ea41fe457fe6dbc13808d 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.370 2006/07/07 13:36:33 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.371 2006/07/07 13:54:32 ph10 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -83,6 +83,9 @@ PH/13 If write_rejectlog was set false when logging was sent to syslog with
       both the the main log and to the reject log were not written to syslog at
       all.
 
       both the the main log and to the reject log were not written to syslog at
       all.
 

+PH/14 In the default configuration, change the use of "message" in ACL warn
+      statements to "add_header".
+

 
 Exim version 4.62
 -----------------
 
 Exim version 4.62
 -----------------

diff --git a/src/src/configure.default b/src/src/configure.default
index cfc5a4985d3223bd7af6c10907793292c0ee4d9c..9ae20dae91aec973333f339751ab826e96e61201 100644 (file)
--- a/src/src/configure.default
+++ b/src/src/configure.default
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/src/configure.default,v 1.8 2006/06/07 17:42:27 fanf2 Exp $
+# $Cambridge: exim/src/src/configure.default,v 1.9 2006/07/07 13:54:32 ph10 Exp $

 
 ######################################################################
 #                  Runtime configuration file for Exim               #
 
 ######################################################################
 #                  Runtime configuration file for Exim               #


@@ -389,9 +389,9 @@ acl_check_rcpt:
   # deny    message       = rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text
   #         dnslists      = black.list.example
   #
   # deny    message       = rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text
   #         dnslists      = black.list.example
   #

-  # warn    message       = X-Warning: $sender_host_address is in a black list at $dnslist_domain
+  # warn    dnslists      = black.list.example
+  #         add_header    = X-Warning: $sender_host_address is in a black list at $dnslist_domain

   #         log_message   = found in $dnslist_domain
   #         log_message   = found in $dnslist_domain

-  #         dnslists      = black.list.example

   #############################################################################
 
   #############################################################################
   #############################################################################
 
   #############################################################################


@@ -440,18 +440,18 @@ acl_check_data:
   # Deny if the message contains a virus. Before enabling this check, you
   # must install a virus scanner and set the av_scanner option above.
   #
   # Deny if the message contains a virus. Before enabling this check, you
   # must install a virus scanner and set the av_scanner option above.
   #

-  # deny    malware   = *
-  #         message   = This message contains a virus ($malware_name).
+  # deny    malware    = *
+  #         message    = This message contains a virus ($malware_name).

 
   # Add headers to a message if it is judged to be spam. Before enabling this,
   # you must install SpamAssassin. You may also need to set the spamd_address
   # option above.
   #
 
   # Add headers to a message if it is judged to be spam. Before enabling this,
   # you must install SpamAssassin. You may also need to set the spamd_address
   # option above.
   #

-  # warn    spam      = nobody
-  #         message   = X-Spam_score: $spam_score\n\
-  #                     X-Spam_score_int: $spam_score_int\n\
-  #                     X-Spam_bar: $spam_bar\n\
-  #                     X-Spam_report: $spam_report
+  # warn    spam       = nobody
+  #         add_header = X-Spam_score: $spam_score\n\
+  #                      X-Spam_score_int: $spam_score_int\n\
+  #                      X-Spam_bar: $spam_bar\n\
+  #                      X-Spam_report: $spam_report

 
   # Accept the message.
 
 
   # Accept the message.