X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=97b96cb6652af61c63f2a4f0c47bea5a8f93a25a;hb=99c219736c3c52f933f120c4411ef8e984f5f9d1;hp=e8200899bc0a6109a14adad8508771964e592ddd;hpb=939f9c0b2ad7b91126f24dec0ac7cedf8b7d796c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index e8200899b..97b96cb66 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -289,6 +289,13 @@ acl_getprofile:
           hosts          = !+debianhosts
           set acl_m_rprf = localonly
 
+<%- if nodeinfo['mailrelay'] -%>
+  warn    local_parts    = +local_only_users
+          domains        = +mailhubdomains
+          hosts          = !+debianhosts
+          set acl_m_rprf = localonly
+
+<%- end -%>
   accept  condition      = ${if eq {$acl_m_rprf}{}{no}{yes}}
 
 <%- if nodeinfo['rtmaster'] -%>
@@ -886,7 +893,7 @@ check_message:
 
   # Some people put from hostmaster@something.debian.org in the From
   # header.  Take their crack pipe away.
-  drop   condition = ${if match{${lc:$h_from:}}{\Npostmaster@(\[^.\].)?debian\.org\N}}
+  drop   condition = ${if match{${lc:$h_From:}}{\Npostmaster@([^.]+\.)?debian\.org\N}}
 
 <%- if nodeinfo['rtmaster'] -%>
   deny    condition = ${if eq {$acl_m_prf}{RTMail}}