]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Fix $emaildomain/neversenders
authorTollef Fog Heen <tfheen@err.no>
Thu, 24 Apr 2014 08:18:14 +0000 (10:18 +0200)
committerTollef Fog Heen <tfheen@err.no>
Thu, 24 Apr 2014 08:18:14 +0000 (10:18 +0200)
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.

modules/exim/templates/eximconf.erb

index 56b59842e6ba19eb773ab8b903682e24ce2bd526..66e01f2e8b34fdc14b60710101306bf505320a14 100644 (file)
@@ -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}}