From 016cd52da823d220641fba116def5b124fcbb0fe Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Tue, 31 Aug 2010 08:30:09 +0100 Subject: [PATCH] fix whitelist macro Signed-off-by: Stephen Gran --- modules/exim/templates/eximconf.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 2bf90c7c1..d652d6b4c 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -249,9 +249,9 @@ received_header_text = Received: ${if def:sender_rcvhost {from $sender_rcvhost\n # Do not wrap! VDOMAINDATA = ${lookup{$domain}partial-lsearch{/etc/exim4/virtualdomains}{$value}} WHITELIST = ${if match_domain{$domain}{+virtual_domains}\ - {${if exists {${extract{directory}{VDOMAINDATA}{${value}/whitelist}}} + {${if exists {${extract{directory}{VDOMAINDATA}{${value}/whitelist}}}\ {${lookup{$local_part}lsearch{${extract{directory}{VDOMAINDATA}{${value}/whitelist}}}{$value}{}}}{}}}\ - {${lookup{$local_part}lsearch{/etc/exim4/whitelist}{$value}{}}}} : \ + {/etc/exim4/whitelist} } : \ ${lookup{$local_part}lsearch{/var/lib/misc/$primary_hostname/mail-whitelist}{$value}{}} GREYLIST_LOCAL_PARTS = ${if match_domain{$domain}{+virtual_domains}\ {${if exists {${extract{directory}{VDOMAINDATA}{${value}/grey_users}}}\ -- 2.20.1