[exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim…

Page principale
Supprimer ce message
Répondre à ce message
Auteur: Philip Hazel
Date:  
À: exim-cvs
Sujet: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim/exim-src/src configure.default
ph10 2006/07/07 14:54:32 BST

  Modified files:
    exim-doc/doc-txt     ChangeLog 
    exim-src/src         configure.default 
  Log:
  In the default configuration, change the use of "message" to "add_header"
  in "warn" statements.


  Revision  Changes    Path
  1.371     +3 -0      exim/exim-doc/doc-txt/ChangeLog
  1.9       +9 -9      exim/exim-src/src/configure.default


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.370
  retrieving revision 1.371
  diff -u -r1.370 -r1.371
  --- ChangeLog    7 Jul 2006 13:36:33 -0000    1.370
  +++ ChangeLog    7 Jul 2006 13:54:32 -0000    1.371
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.370 2006/07/07 13:36:33 ph10 Exp $
  +$Cambridge: exim/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
   -------------------------------------------
  @@ -82,6 +82,9 @@
         syslog_duplication set false, log lines that would normally be written
         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

  Index: configure.default
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/configure.default,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- configure.default    7 Jun 2006 17:42:27 -0000    1.8
  +++ configure.default    7 Jul 2006 13:54:32 -0000    1.9
  @@ -1,4 +1,4 @@
  -# $Cambridge: exim/exim-src/src/configure.default,v 1.8 2006/06/07 17:42:27 fanf2 Exp $
  +# $Cambridge: exim/exim-src/src/configure.default,v 1.9 2006/07/07 13:54:32 ph10 Exp $


   ######################################################################
   #                  Runtime configuration file for Exim               #
  @@ -389,9 +389,9 @@
     # 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
  -  #         dnslists      = black.list.example
     #############################################################################


     #############################################################################
  @@ -440,18 +440,18 @@
     # 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.
     #
  -  # 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.