X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=4739f0df84aa249cc14f5143aaf23a292d1ee1f8;hb=789648233fd398fbf44de53951a84980fd755852;hp=38e89bd777b6bcb6a6b3889f345d86555327b701;hpb=bc087e036cd6bc75711a06ad0062f883a295794a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 38e89bd77..4739f0df8 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -465,7 +465,7 @@ out
 
   # This logic gives you a list of commonly forged domains in helo to reject against
 
-  warn set acl_m2      = ${lookup{$sender_helo_name} \
+  warn set acl_m_frg   = ${lookup{$sender_helo_name} \
                            nwildlsearch{/etc/exim4/helo-check} \
                           {${if eq{$value}{}{$sender_helo_name}{$value}}}{}}
 
@@ -473,15 +473,15 @@ out
   # say helo as a name in the list but we can't look them up
 
   defer !hosts         = +debianhosts
-        condition      = ${if eq{$acl_m2}{}{no}{yes}}
+        condition      = ${if eq{$acl_m_frg}{}{no}{yes}}
         condition      = ${if eq{$sender_host_name}{}{yes}{no}}
         condition      = ${if eq{$host_lookup_failed}{1}{no}{yes}}
         message        = Access temporarily denied. Resolve failed PTR for $sender_host_address
 
   # If DNS works, go ahead and reject them
 
-  drop !hosts          = +debianhosts
-       condition       = ${if and { {!eq{$acl_m2}{}}{!match{$sender_host_name}{${rxquote:$acl_m2}\N$\N}}}{yes}{no}}
+  drop  !hosts         = +debianhosts
+        condition      = ${if and { {!eq{$acl_m_frg}{}}{!match{$sender_host_name}{${rxquote:$acl_m_frg}\N$\N}}}{yes}{no}}
         message        = HELO mismatch Forged HELO for ($sender_helo_name)
 
   # disabled accounts don't even get local mail.
@@ -521,20 +521,20 @@ out
           condition     = ${if match_local_part {$sender_address_local_part}{${extract{directory}{VDOMAINDATA}{${value}/neversenders}}}{1}{0}}
 	  message       = no mail should ever come from <$sender_address>
 
-  warn    condition     = ${if eq{$acl_m6}{}}
+  warn    condition     = ${if eq{$acl_m_lcl}{}}
           acl           = acl_localonly
-          set acl_m6    = localonly
-          set acl_m7    = ${if eq{$acl_m7}{}{$local_part@$domain}{$acl_m7, $local_part@$domain}}
+          set acl_m_lcl = localonly
+          set acl_m_lrc = ${if eq{$acl_m_lrc}{}{$local_part@$domain}{$acl_m_lrc, $local_part@$domain}}
 
-  warn    condition     = ${if eq{$acl_m6}{}}
+  warn    condition     = ${if eq{$acl_m_lcl}{}}
           !acl          = acl_localonly
-          set acl_m6    = normal
+          set acl_m_lcl = normal
 
-  defer   condition     = ${if eq{$acl_m6}{localonly}}
+  defer   condition     = ${if eq{$acl_m_lcl}{localonly}}
           !acl          = acl_localonly
           log_message   = Only one profile at a time, please
 
-  defer   condition     = ${if eq{$acl_m6}{normal}}
+  defer   condition     = ${if eq{$acl_m_lcl}{normal}}
           acl           = acl_localonly
           log_message   = Only one profile at a time, please
 
@@ -809,8 +809,8 @@ out
 %>
 
 acl_check_predata:
-  deny   condition     = ${if eq{$acl_m6}{localonly}}
-         message       = mail for $acl_m7 is only accepted internally
+  deny   condition     = ${if eq{$acl_m_lcl}{localonly}}
+         message       = mail for $acl_m_lrc is only accepted internally
 
   accept