From: Stephen Gran Date: Wed, 15 Jul 2009 13:11:35 +0000 (+0100) Subject: Don't force failure, force an empty expansion X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7f6a93dafff2f6ff9af6ede15e3ba25c0a581cc6;p=mirror%2Fdsa-puppet.git Don't force failure, force an empty expansion Signed-off-by: Stephen Gran --- diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index cf918beea..ae82404b4 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -367,12 +367,12 @@ out accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} - warn condition = ${if eq{${lookup{$local_part}cdb{/var/lib/misc/${primary_hostname}/mail-contentinspectionaction.cdb}{$value}fail}}{markup}} + warn condition = ${if eq{${lookup{$local_part}cdb{/var/lib/misc/${primary_hostname}/mail-contentinspectionaction.cdb}{$value}{}}}{markup}} set acl_m_rprf = markup accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} - warn condition = ${if eq{${lookup{$local_part}cdb{/var/lib/misc/${primary_hostname}/mail-contentinspectionaction.cdb}{$value}fail}}{blackhole}} + warn condition = ${if eq{${lookup{$local_part}cdb{/var/lib/misc/${primary_hostname}/mail-contentinspectionaction.cdb}{$value}{}}}{blackhole}} set acl_m_rprf = blackhole accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}}