From: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Fri, 22 Nov 2019 21:36:28 +0000 (+0000)
Subject: eximconf: create a convenience copy of the message body for matching
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=inline;h=64114b617b1dfed1c2618a0535e648df0b7fe577;p=mirror%2Fdsa-puppet.git

eximconf: create a convenience copy of the message body for matching

Apply a fairly naive attempt at removing quoted-printable line endings

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index cc8294a7b..c52580359 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -1076,6 +1076,8 @@ check_message:
           log_message     = Implausible Received header
           message         = Header problem: message rejected
 
+  warn    set acl_m_body = ${sg{$message_body}{= }{}}
+
   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,}} \