From 3c8200fe5ed3cf45413ff0952ac423b02e8696d6 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Wed, 15 Jul 2009 15:00:00 +0100 Subject: [PATCH] 14:58 < weasel> mail- is redundant Signed-off-by: Stephen Gran --- modules/exim/templates/eximconf.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index bb1808a7a..b3c251cba 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -368,8 +368,8 @@ out accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} warn domains = +virtual_domains - condition = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/mail-contentinspectionaction}}}} - condition = ${if eq{${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/mail-contentinspectionaction}}}{$value}{}}}{markup}} + condition = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/contentinspectionaction}}}} + condition = ${if eq{${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/contentinspectionaction}}}{$value}{}}}{markup}} set acl_m_rprf = markup accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} @@ -385,8 +385,8 @@ out accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} warn domains = +virtual_domains - condition = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/mail-contentinspectionaction}}}} - condition = ${if eq{${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/mail-contentinspectionaction}}}{$value}{}}}{blackhole}} + condition = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/contentinspectionaction}}}} + condition = ${if eq{${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/contentinspectionaction}}}{$value}{}}}{blackhole}} set acl_m_rprf = blackhole accept condition = ${if eq {$acl_m_rprf}{}{no}{yes}} -- 2.20.1