X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=45b3c43760b97d69e04f1709eb4a34bffdcfd96d;hb=cd6ba3eb9c9a6c35386fb6c413f1dfb592934182;hp=3d5b570b7314f8efd7c670ce0edbfe74bdc18408;hpb=cac487301d0cca450782f71990f10d66ccfac8f1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 3d5b570b7..45b3c4376 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -307,10 +307,10 @@ GREYLIST_LOCAL_PARTS = ${if match_domain{$domain}{+virtual_domains}\
 # If a user has not explicitly disabled the option, the assumption is in
 # favour of filtering.
 HAS_DEFAULT_OPTIONS = ${if and {\
-		        {eq{${lookup{$local_part}dbmnz{/var/lib/misc/$primary_hostname/default-mail-options.db}{$value}{TRUE}}}{TRUE}}\
-		        {exists{${extract{directory}{VDOMAINDATA}{${value}/mail-forward.db}}}}\
-		        {! eq {${lookup{$local_part}dbmnz{${extract{directory}{VDOMAINDATA}{${value}/mail-forward.db}}}}}{}}\
-			}}
+                       {eq{${lookup{$local_part}dbmnz{/var/lib/misc/$primary_hostname/default-mail-options.db}{$value}{TRUE}}}{TRUE}}\
+                       {exists{${extract{directory}{VDOMAINDATA}{${value}/mail-forward.db}}}}\
+                       {! eq {${lookup{$local_part}dbmnz{${extract{directory}{VDOMAINDATA}{${value}/mail-forward.db}}}}}{}}\
+                       }}
 <%- if @is_rtmaster -%>
 # This subject rewrite is embedded in double-quoted strings. As such, some of
 # the items need more escaping than usual, otherwise \N becomes simply "N" and
@@ -725,7 +725,7 @@ check_recipient:
 <%- if @is_packagesmaster -%>
   warn    condition      = ${if eq {$acl_m_prf}{PackagesMail}}
           condition      = ${if eq {$sender_address}{$local_part@$domain}}
-          message        = X-Packages-FromTo-Same: yes
+          add_header     = X-Packages-FromTo-Same: yes
 
 <%- end -%>
   deny    condition      = ${if !eq {$acl_m_prf}{PopconMail}}
@@ -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
@@ -993,7 +993,7 @@ acl_check_mime:
          condition     = ${if eq {$acl_m_prf}{markup}}
          set acl_m_srb = ${perl{surblspamcheck}}
          condition     = ${if !eq{$acl_m_srb}{false}}
-         message       = X-Surbl-Hit: $primary_hostname: $acl_m_srb
+         add_header    = X-Surbl-Hit: $primary_hostname: $acl_m_srb
 
   # Dump MIME parts to disk. "default" creates sequentially-named files
   # in <spool_directory>/scan/<message_id>/ which should then be
@@ -1056,7 +1056,7 @@ check_message:
 # postfix's strict_7bit_headers option, but only checks a few common problem
 # headers, as there doesn't appear to be an easy way to check them all.
   deny
-  	  condition       = ${if or {{match {$rh_Subject:}{[\200-\377]}}\
+	  condition       = ${if or {{match {$rh_Subject:}{[\200-\377]}}\
 	                         {match {$rh_To:}{[\200-\377]}}\
 				 {match {$rh_From:}{[\200-\377]}}\
 				 {match {$rh_Cc:}{[\200-\377]}}}}