From: Tollef Fog Heen <tfheen@err.no>
Date: Thu, 24 Apr 2014 08:18:14 +0000 (+0200)
Subject: Fix $emaildomain/neversenders
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=a4316cee2c4a3a78048b0f02e15d7d70ee164ac4

Fix $emaildomain/neversenders

Exim's match_local_part does not expand the second argument (unless
compiled with EXPAND_LISTMATCH_RHS), so this could not really have
worked before.  We now use an lookup/lsearch instead of
match_local_part.
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 56b59842..66e01f2e 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -633,7 +633,7 @@ check_recipient:
 
   deny    condition     = ${if match_domain{$sender_address_domain}{+virtual_domains}{1}{0}}
           condition     = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/neversenders}}}{1}{0}}
-          condition     = ${if match_local_part {$sender_address_local_part}{${extract{directory}{VDOMAINDATA}{${value}/neversenders}}}{1}{0}}
+          condition     = ${lookup{$sender_address_local_part}lsearch{${extract{directory}{VDOMAINDATA}{${value}/neversenders}}{true}}
 	  message       = no mail should ever come from <$sender_address>
 
   warn    condition     = ${if eq{$acl_m_prf}{localonly}}