From 57ff971603fd14d7f511f090ae32bef85effbc16 Mon Sep 17 00:00:00 2001 From: Martin Zobel-Helas Date: Sun, 25 Jun 2017 13:09:30 +0200 Subject: [PATCH] make demime=* conditional Signed-off-by: Martin Zobel-Helas --- modules/exim/templates/eximconf.erb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 0d8698969..828186784 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -958,18 +958,24 @@ check_message: <%- if has_variable?("clamd") && @clamd -%> discard condition = ${if eq {$acl_m_prf}{blackhole}} + <%- if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0 -%> demime = * + <%- end -%> malware = */defer_ok log_message = discarded malware message for $recipients deny condition = ${if eq {$acl_m_prf}{markup}{no}{yes}} condition = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}} + <%- if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0 -%> demime = * + <%- end -%> malware = */defer_ok message = malware detected: $malware_name: message rejected warn condition = ${if eq {$acl_m_prf}{markup}} + <%- if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0 -%> demime = * + <%- end -%> malware = */defer_ok message = X-malware detected: $malware_name -- 2.20.1