From: Tollef Fog Heen <tfheen@err.no>
Date: Sat, 9 Sep 2017 18:19:47 +0000 (+0200)
Subject: Make last commit work
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=bc7a6a9a8cf2d944b93eeb3831383658c31905f5

Make last commit work

Exim's command language is complex and hard to get right, so adjust as
necessary to make this behave in a predictable way.  Also use explicit
true/false to make condition= not upset.
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 0be55338a..027cff9f1 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -598,7 +598,7 @@ check_recipient:
   # disabled accounts don't even get local mail.
   deny   domains       = +virtual_domains
          condition    = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}\
-                                     {lookup{${extract{1}{-}{$local_part}}}lsearch;${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}\
+                                     {${lookup{${extract{1}{-}{$local_part}}}lsearch{${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}{true}{false}}}\
                                      {}}
          message       = ${lookup{${extract{1}{-}{$local_part}}}lsearch{${extract{directory}{VDOMAINDATA}{${value}/mail-disable}}}{$value}}