From: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Tue, 22 Oct 2019 19:32:42 +0000 (+0100)
Subject: eximconf: ensure all recipients have the same default options setting
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e76e6b2577f5216a2674c181e25c6c8c59d33783;hp=6901e51f8f300b6a61c812f6841c1e2168e3353b;p=mirror%2Fdsa-puppet.git

eximconf: ensure all recipients have the same default options setting

This allows us to perform tests at DATA time that are dependent on the
default options flag

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 5db40f36c..e7a73de7d 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -609,6 +609,15 @@ check_recipient:
           message       = Different profile, please retry
           log_message   = Only one profile at a time, please
 
+  warn    set acl_m_rdefopt = ${if bool_lax{HAS_DEFAULT_OPTIONS}}
+
+  warn    condition        = ${if eq{$acl_m_defopt}{}}
+          set acl_m_defopt = $acl_m_rdefopt
+
+  defer   condition     = ${if !eq{$acl_m_defopt}{$acl_m_rdefopt}}
+          message       = Different profile, please retry
+          log_message   = Only one default options profile at a time, please
+
   # Set a flag to indicate whether the current recipient
   # has explicitly requested greylisting
   warn    set acl_m_grey_recip = 0