X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=d65b3c2f662f1a254c5ee5aaaedee823c921b875;hb=5321589156a326191f02125b89e15bbdaef5ea71;hp=bb7c7566cb78c1bcb4d36ce90b7fffb766d4bbd5;hpb=08a1906121670d960592fbbf6ec489ff54c8b64c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index bb7c7566c..d65b3c2f6 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -601,6 +601,13 @@ check_recipient:
           message       = Different profile, please retry
           log_message   = Only one profile at a time, please
 
+  # Set a flag to indicate whether the current recipient
+  # has explicitly requested greylisting
+  warn    set acl_m_grey_recip = 0
+
+  warn    local_parts   = GREYLIST_LOCAL_PARTS
+          set acl_m_grey_recip = 1
+
   # Defer after too many bad RCPT TO's.  Legit MTAs will retry later.
   # This is a rough pass at preventing address harvesting or other mail blasts.
 
@@ -782,10 +789,10 @@ check_recipient:
     message  = $sender_host_address is not yet authorized to deliver mail from <$sender_address> to <$local_part@$domain>.
     log_message = greylisted.
     condition      = ${if or { \
-                                 {match_local_part{$local_part}{GREYLIST_LOCAL_PARTS}} \
-                                 {HAS_DEFAULT_OPTIONS} \
+                                 {eq{$acl_m_grey_recip}{1}} \
+                                 {bool_lax{HAS_DEFAULT_OPTIONS}} \
                              } \
-                     }
+                      }
     !senders       = :
     !hosts         = : +debianhosts : WHITELIST : \
                      ${if exists {/etc/greylistd/whitelist-hosts}\
@@ -820,10 +827,10 @@ check_recipient:
     !authenticated = *
     domains        = +handled_domains
     condition      = ${if or { \
-                                 {match_local_part{$local_part}{GREYLIST_LOCAL_PARTS}} \
-                                 {HAS_DEFAULT_OPTIONS} \
+                                 {eq{$acl_m_grey_recip}{1}} \
+                                 {bool_lax{HAS_DEFAULT_OPTIONS}} \
                              } \
-                     }
+                      }
     set acl_m_pgr  = request=smtpd_access_policy\n\
                      protocol_state=RCPT\n\
                      protocol_name=${uc:$received_protocol}\n\
@@ -849,10 +856,10 @@ check_recipient:
     !authenticated = *
     domains        = +handled_domains
     condition      = ${if or { \
-                                 {match_local_part{$local_part}{GREYLIST_LOCAL_PARTS}} \
-                                 {HAS_DEFAULT_OPTIONS} \
+                                 {eq{$acl_m_grey_recip}{1}} \
+                                 {bool_lax{HAS_DEFAULT_OPTIONS}} \
                              } \
-                     }
+                      }
     condition      = ${if eq{${uc:${substr_0_7:$acl_m_pgr}}}{PREPEND}}
     message        = ${sg{$acl_m_pgr}{\N^\w+\s*\N}{}}