Don't reject spam messages from a few trusted hosts.

Rejecting this messages would only cause those hosts to generate useless
delivery failures to innocent people. Instead, we just deliver these
messages...

diff --git a/etc/exim4/conf.d/acl/40_exim4-config_check_data b/etc/exim4/conf.d/acl/40_exim4-config_check_data
index 23137891411261283699fdc2718aeeca11b242f1..fbaacfa0b7a59ed0b5bcfbb6dec3c85fdb74f5d8 100644 (file)
--- a/etc/exim4/conf.d/acl/40_exim4-config_check_data
+++ b/etc/exim4/conf.d/acl/40_exim4-config_check_data
@@ -26,6 +26,10 @@ acl_check_data:
     message = Message was classified as spam
     # Check using spamassasin, running as the "spamd" user.
     spam = spamd
+    # Don't reject to some trusted hosts, since they will only generate
+    # useless delivery failures to innocent people. We check this after the
+    # spamcheck, so the next rule can still the spam headers properly.
+    !hosts = +dont_reject_spam_hosts
 
   # Accept any other messages, but add spam headers.
   accept

diff --git a/etc/exim4/conf.d/main/main_config b/etc/exim4/conf.d/main/main_config
index bed01f25742721a6acc2481bbf5e092f853f23ee..771d2b6d5d775f157394adef970e74bc994fdd5f 100644 (file)
--- a/etc/exim4/conf.d/main/main_config
+++ b/etc/exim4/conf.d/main/main_config
@@ -23,6 +23,10 @@ domainlist relay_to_domains = fizzgig.eu : fizzgig.nl
 # at first glance.
 hostlist relay_from_hosts = *.drsnuggles.stderr.nl : drsnuggles.stderr.nl 
 
+# Don't reject spam from these hosts, since they are known dumb, but trusted
+# relays. They will only send rejects to the wrong people.
+hostlist dont_reject_spam_hosts = katherina.student.utwente.nl : kat.student.utwente.nl : *.utsp.utwente.nl
+
 # Use this domain on any unqualified addresses that get submitted. Since this
 # can come from any vserver, just use our main hostname.
 qualify_domain = drsnuggles.stderr.nl