relax some checks for known-stupid senders (from bombadil)

diff --git a/include/acl-content b/include/acl-content
index efdf64b974ff4e77a51c5cbaf31d9d2cd218c438..e2f9e9c1c5d1682e38e4cf37eb6b780bbc9d99a4 100644 (file)
--- a/include/acl-content
+++ b/include/acl-content
@@ -7,7 +7,8 @@ check_content:
   accept  hosts                = +trust_hosts
 
   # Require a little standards compliance, even from relay_hosts
-  require verify       = header_syntax
+  deny    !sender_domains = bounces.amazon.com
+         !verify       = header_syntax
           message      = Invalid address in message header. Consult RFC2822.
 
   # But do add Message-ID: and Date: headers for hosts in relay_hosts
@@ -62,7 +63,8 @@ check_content:
                but no 'Re:' in Subject:\n$acl_m_greylistreasons
 
   # Deny messages without Message-ID, but allow bounces.
-  deny  !senders = : 
+  deny  !senders = :
+       !sender_domains = returns.bulk.yahoo.com : support.expedia.co.uk : customercare.expedia.com
        condition = ${if !def:h_Message-ID: {1}}
         message        = RFC2822 says you SHOULD have a Message-ID.\n\
                  Most messages without it are spam, so your mail has been rejected.