Handle disabling of addresses with extensions correctly

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 05d79fb..0be5533 100644 (file)
--- 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