X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=7b19e3288138bda7dee54c6f5add3b04b4498049;hb=419e3fe1fad8668d50e9c2dca72168b6c4e8c7aa;hp=5dcb0db3ab7025bd28487ef36c78fdfb79648f52;hpb=53ab51e4c908bd7f6c6bfa15c6c04d485dddfcc3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 5dcb0db3a..7b19e3288 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -107,7 +107,7 @@ allow_domain_literals = true
 # local_domains. It will be referenced
 # later on by the syntax "+local_domains".
 # Other domain and host lists may follow.
-# @ is the local FQDN, @[] matches the IP adress of any local interface.
+# @ is the local FQDN, @[] matches the IP address of any local interface.
 
 domainlist local_domains = @ : \
     @[] : \
@@ -1072,31 +1072,26 @@ check_message:
           condition       = ${if !eq {$acl_m_prf}{PopconMail}}
 	  message         = Your mailer is not RFC 2047 compliant: message rejected
 
-  discard condition      = ${if eq {$acl_m_prf}{blackhole}}
-          condition      = ${if bool_lax{$acl_m_defopt}}
+  warn    condition      = ${if bool_lax{$acl_m_defopt}}
           condition      = ${if or {\
                                     {match {$message_body}{Wenn Sie zuk&uuml;nftig keine weiteren Informationen erhalten m&ouml;chten, <br />unwissentlich oder unbeabsichtigt in den Verteiler aufgenommen wurden,}} \
                                     {match {$message_body}{\N(?i)Dear Beneficiary.*You have been selected.*Thousand United States Dollars\N}} \
+                                    {match {$message_body}{\N(?i)receiving sum of money into your account for safe keeping\N}} \
+                                    {match {$message_body}{\N(?i)I got your e-mail address through an internet marketing firm\N}} \
                                    }\
                             }
+          set acl_m_content = 1
+
+  discard condition      = ${if eq {$acl_m_prf}{blackhole}}
+          condition      = ${if eq {$acl_m_content}{1}}
           log_message    = Discarded suspicious content for $recipients
 
   deny    condition      = ${if !eq {$acl_m_prf}{markup}}
-          condition      = ${if bool_lax{$acl_m_defopt}}
-          condition      = ${if or {\
-                                    {match {$message_body}{Wenn Sie zuk&uuml;nftig keine weiteren Informationen erhalten m&ouml;chten, <br />unwissentlich oder unbeabsichtigt in den Verteiler aufgenommen wurden,}} \
-                                    {match {$message_body}{\N(?i)Dear Beneficiary.*You have been selected.*Thousand United States Dollars\N}} \
-                                   }\
-                            }
+          condition      = ${if eq {$acl_m_content}{1}}
           message        = Rejected due to suspicious content
 
   warn    condition      = ${if eq {$acl_m_prf}{markup}}
-          condition      = ${if bool_lax{$acl_m_defopt}}
-          condition      = ${if or {\
-                                    {match {$message_body}{Wenn Sie zuk&uuml;nftig keine weiteren Informationen erhalten m&ouml;chten, <br />unwissentlich oder unbeabsichtigt in den Verteiler aufgenommen wurden,}} \
-                                    {match {$message_body}{\N(?i)Dear Beneficiary.*You have been selected.*Thousand United States Dollars\N}} \
-                                   }\
-                            }
+          condition      = ${if eq {$acl_m_content}{1}}
           add_header     = X-debian-content-warning: yes
 
 <%- if has_variable?("clamd") && @clamd -%>