projects
/
matthijs
/
servers
/
drsnuggles.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exim: Add alias for fetchmail-daemon@.
[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 58a65f3f148caf65d85eab9e918419cc3a9a65e4..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
@@
-15,17
+15,10
@@
acl_check_data:
message = Message headers fail syntax check
!verify = header_syntax
message = Message headers fail syntax check
!verify = header_syntax
-
- # require that there is a verifiable sender address in at least
- # one of the "Sender:", "Reply-To:", or "From:" header lines.
- deny
- message = No verifiable sender address in message headers
- !verify = header_sender
-
# Don't spamcheck big messages
accept
condition = ${if >{$message_size}{80k}}
# Don't spamcheck big messages
accept
condition = ${if >{$message_size}{80k}}
- add_header = X-Spam-
Report
: Message too big, not scanned.
+ add_header = X-Spam-
Score
: Message too big, not scanned.
# Deny messages with a large spamscore. The threshold is set by
# spamassassin, see required_score in /etc/spamassassin/local.cf
# Deny messages with a large spamscore. The threshold is set by
# spamassassin, see required_score in /etc/spamassassin/local.cf
@@
-33,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