projects
/
matthijs
/
servers
/
drsnuggles.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't reject spam messages from a few trusted hosts.
[matthijs/servers/drsnuggles.git]
/
etc
/
exim4
/
conf.d
/
acl
/
40_exim4-config_check_data
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
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
# Accept any other messages, but add spam headers.
accept