From 82ce486fc7ff8198c622aa9f6041d03550b2c67a Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Sat, 9 Sep 2017 20:05:55 +0200 Subject: [PATCH] Handle disabling of addresses with extensions correctly --- modules/exim/templates/eximconf.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 05d79fb0f..0be55338a 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -597,10 +597,10 @@ check_recipient: # disabled accounts don't even get local mail. deny domains = +virtual_domains - local_parts = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}\ - {lsearch;${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}\ + condition = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}\ + {lookup{${extract{1}{-}{$local_part}}}lsearch;${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}\ {}} - message = ${lookup{$local_part}lsearch{${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}{$value}} + message = ${lookup{${extract{1}{-}{$local_part}}}lsearch{${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}{$value}} deny local_parts = lsearch;/var/lib/misc/$primary_hostname/mail-disable domains = +local_domains -- 2.20.1