From: Tollef Fog Heen <tfheen@err.no>
Date: Thu, 15 Dec 2011 21:35:18 +0000 (+0100)
Subject: Fix up postmaster@ regex
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=24f2979fbc4a02221a6e045758dc02557ef36efc;p=mirror%2Fdsa-puppet.git

Fix up postmaster@ regex
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index e8200899b..8ba778600 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -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}}