]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Fix up postmaster@ regex
authorTollef Fog Heen <tfheen@err.no>
Thu, 15 Dec 2011 21:35:18 +0000 (22:35 +0100)
committerTollef Fog Heen <tfheen@err.no>
Thu, 15 Dec 2011 21:35:18 +0000 (22:35 +0100)
modules/exim/templates/eximconf.erb

index e8200899bc0a6109a14adad8508771964e592ddd..8ba77860022d8fbed2cd33fbe501c4a1345df542 100644 (file)
@@ -886,7 +886,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}}