From: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Fri, 27 Sep 2019 11:35:10 +0000 (+0100)
Subject: eximconf: simplify a sender domain check by using sender_domains
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ece79a88f34b773b6fa07ec8bbd886311b2e3226;p=mirror%2Fdsa-puppet.git

eximconf: simplify a sender domain check by using sender_domains

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 336b9d639..9d29cff8f 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -670,7 +670,7 @@ check_recipient:
 	  hosts         = !+debianhosts
 	  message       = mail from <$sender_address> not allowed externally
 
-  deny    condition     = ${if match_domain{$sender_address_domain}{+virtual_domains}}
+  deny    sender_domains= +virtual_domains
           condition     = ${if exists {${extract{directory}{VSENDERDOMAINDATA}{${value}/neversenders}}}}
           condition     = ${lookup{$sender_address_local_part}lsearch{${extract{directory}{VSENDERDOMAINDATA}{${value}/neversenders}}}{true}}
 	  message       = no mail should ever come from <$sender_address>