From 9fdc450dd92b609b1d6038f495c5c4dc7d39b417 Mon Sep 17 00:00:00 2001
From: "Adam D. Barratt" <adam@adam-barratt.org.uk>
Date: Fri, 1 Nov 2019 20:16:47 +0000
Subject: [PATCH] eximconf: factor out content checks

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
---
 modules/exim/templates/eximconf.erb | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 5dcb0db3a..5e45b1585 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -1072,31 +1072,24 @@ 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}} \
                                    }\
                             }
+          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 -%>
-- 
2.20.1