From: Stephen Gran <steve@lobefin.net>
Date: Sun, 18 Apr 2010 12:56:00 +0000 (+0100)
Subject: correct mail-disable lookup
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a8b244c4c50add204e574cc5b42828ebbf681b6d;p=dsa-puppet.git

correct mail-disable lookup

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index b512b780..163e3b49 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -564,7 +564,7 @@ check_recipient:
   # disabled accounts don't even get local mail.
   deny   domains       = +virtual_domains
          local_parts   = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}\
-                                     {${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}\
+                                     {${lookup{$local_part}lsearch{${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}}}\
                                      {}}
          message       = ${lookup{$local_part}lsearch{${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}{$value}}