rpms/exim/devel exim-4.66-greylist-conf.patch,1.1,1.2

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/extras/rpms/exim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25393

Modified Files:
	exim-4.66-greylist-conf.patch 
Log Message:
require helo, show how to greylist for no rdns

exim-4.66-greylist-conf.patch:

Index: exim-4.66-greylist-conf.patch
===================================================================
RCS file: /cvs/extras/rpms/exim/devel/exim-4.66-greylist-conf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- exim-4.66-greylist-conf.patch	7 Feb 2007 12:57:15 -0000	1.1
+++ exim-4.66-greylist-conf.patch	8 Feb 2007 10:32:13 -0000	1.2
@@ -1,6 +1,44 @@
---- exim-4.66/src/configure.default.grey	2007-02-07 12:01:16.000000000 +0000
-+++ exim-4.66/src/configure.default	2007-02-07 12:09:06.000000000 +0000
-@@ -435,7 +435,8 @@ acl_check_rcpt:
+--- exim-4.66/src/configure.default.grey	2007-02-07 13:07:40.000000000 +0000
++++ exim-4.66/src/configure.default	2007-02-08 10:16:17.000000000 +0000
+@@ -105,6 +105,7 @@ hostlist   relay_from_hosts = 127.0.0.1
+ # manual for details. The lists above are used in the access control lists for
+ # checking incoming messages. The names of these ACLs are defined here:
+ 
++acl_smtp_mail = acl_check_mail
+ acl_smtp_rcpt = acl_check_rcpt
+ acl_smtp_data = acl_check_data
+ acl_smtp_mime = acl_check_mime
+@@ -318,6 +319,29 @@ timeout_frozen_after = 7d
+ 
+ begin acl
+ 
++
++# This access control list is used for the MAIL command in an incoming
++# SMTP message.
++
++acl_check_mail:
++
++  # Hosts are required to say HELO (or EHLO) before sending mail.
++  # So don't allow them to use the MAIL command if they haven't
++  # done so.
++
++  deny condition = ${if eq{$sender_helo_name}{} {1}}
++       message = Nice boys say HELO first
++
++  # Use the lack of reverse DNS to trigger greylisting. Some people
++  # even reject for it but that would be a little excessive.
++  
++  warn condition = ${if eq{$sender_host_name}{} {1}}
++       set acl_m_greylistreasons = Host $sender_host_address lacks reverse DNS\n$acl_m_greylistreasons
++  
++  accept
++
++
++
+ # This access control list is used for every RCPT command in an incoming
+ # SMTP message. The tests are run in order until the address is either
+ # accepted or denied.
+@@ -435,7 +459,8 @@ acl_check_rcpt:
    # There are no default checks on DNS black lists because the domains that
    # contain these lists are changing all the time. However, here are two
    # examples of how you can get Exim to perform a DNS black list lookup at this
@@ -10,7 +48,7 @@
    #
    # deny    message       = rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text
    #         dnslists      = black.list.example
-@@ -443,6 +444,10 @@ acl_check_rcpt:
+@@ -443,6 +468,10 @@ acl_check_rcpt:
    # 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
@@ -21,7 +59,7 @@
    #############################################################################
  
    #############################################################################
-@@ -456,6 +461,10 @@ acl_check_rcpt:
+@@ -456,6 +485,10 @@ acl_check_rcpt:
    # require verify = csa
    #############################################################################
  
@@ -32,7 +70,7 @@
    # At this point, the address has passed all the checks that have been
    # configured, so we accept it unconditionally.
  
-@@ -481,6 +490,12 @@ acl_check_data:
+@@ -481,6 +514,12 @@ acl_check_data:
    # deny    condition  = ${if !def:h_Message-ID: {1}}
    #         message    = RFC2822 says that all mail SHOULD have a Message-ID header.\n\
    #                      Most messages without it are spam, so your mail has been rejected.
@@ -45,7 +83,7 @@
  
    # Deny if the message contains a virus. Before enabling this check, you
    # must install a virus scanner and set the av_scanner option above.
-@@ -515,8 +530,30 @@ acl_check_data:
+@@ -515,8 +554,30 @@ acl_check_data:
    #         message   = Your message scored $spam_score SpamAssassin point. Report follows:\n\
    #  	    	        $spam_report