From: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Fri, 25 Oct 2019 17:08:27 +0000 (+0100)
Subject: eximconf: use acl_m_defopt instead of re-evaluating HAS_DEFAULT_OPTIONS
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b43dbb621c4983145441757c3eee344600cbefb8;hp=c888c37605afc9df975cb77e237a054af392163a;p=mirror%2Fdsa-puppet.git

eximconf: use acl_m_defopt instead of re-evaluating HAS_DEFAULT_OPTIONS

This makes no difference to the result, but makes reading debug output
much simpler.

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 1441c9b6a..ee73e02e0 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -810,7 +810,7 @@ check_recipient:
     log_message = greylisted.
     condition      = ${if or { \
                                  {eq{$acl_m_grey_recip}{1}} \
-                                 {bool_lax{HAS_DEFAULT_OPTIONS}} \
+                                 {bool_lax{$acl_m_defopt}} \
                              } \
                       }
     !senders       = :
@@ -851,7 +851,7 @@ check_recipient:
     domains        = +handled_domains
     condition      = ${if or { \
                                  {eq{$acl_m_grey_recip}{1}} \
-                                 {bool_lax{HAS_DEFAULT_OPTIONS}} \
+                                 {bool_lax{$acl_m_defopt}} \
                              } \
                       }
     set acl_m_pgr  = request=smtpd_access_policy\n\
@@ -881,7 +881,7 @@ check_recipient:
     domains        = +handled_domains
     condition      = ${if or { \
                                  {eq{$acl_m_grey_recip}{1}} \
-                                 {bool_lax{HAS_DEFAULT_OPTIONS}} \
+                                 {bool_lax{$acl_m_defopt}} \
                              } \
                       }
     condition      = ${if eq{${uc:${substr_0_7:$acl_m_pgr}}}{PREPEND}}
@@ -915,7 +915,7 @@ check_recipient:
           !hosts   = +debianhosts : WHITELIST
 
   deny    message   = host $sender_host_address is listed in $dnslist_domain ($dnslist_value); see $dnslist_text
-          condition = ${if bool_lax{HAS_DEFAULT_OPTIONS}}
+          condition = ${if bool_lax{$acl_m_defopt}}
           dnslists  = relays.dnsbl.sorbs.net : xbl.spamhaus.org
           domains   = +handled_domains
           !hosts    = +debianhosts : WHITELIST
@@ -936,7 +936,7 @@ check_recipient:
           !hosts   = +debianhosts : WHITELIST
 
   deny    message   = domain $sender_address_domain is listed in $dnslist_domain ($dnslist_value); see $dnslist_text
-          condition = ${if bool_lax{HAS_DEFAULT_OPTIONS}}
+          condition = ${if bool_lax{$acl_m_defopt}}
           dnslists  = dbl.spamhaus.org/$sender_address_domain
           domains   = +handled_domains
           !hosts    = +debianhosts : WHITELIST