X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=etc%2Fexim4%2Fconf.d%2Facl%2F40_exim4-config_check_data;h=23137891411261283699fdc2718aeeca11b242f1;hb=3d3bb8d4eabffeb3bddf6ae4a0df5ee402b58e54;hp=0cf685a0bfff7091740c45a8ea045149296b31d5;hpb=00913fc5c4f0bd4a78df5fb067cfb10392aebe7c;p=matthijs%2Fservers%2Fdrsnuggles.git

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 0cf685a..2313789 100644
--- a/etc/exim4/conf.d/acl/40_exim4-config_check_data
+++ b/etc/exim4/conf.d/acl/40_exim4-config_check_data
@@ -15,12 +15,21 @@ acl_check_data:
     message = Message headers fail syntax check
     !verify = header_syntax
 
+  # Don't spamcheck big messages
+  accept
+    condition = ${if >{$message_size}{80k}}
+    add_header = X-Spam-Score: Message too big, not scanned.
 
-  # require that there is a verifiable sender address in at least
-  # one of the "Sender:", "Reply-To:", or "From:" header lines.
+  # Deny messages with a large spamscore. The threshold is set by
+  # spamassassin, see required_score in /etc/spamassassin/local.cf
   deny
-    message = No verifiable sender address in message headers
-    !verify = header_sender
+    message = Message was classified as spam
+    # Check using spamassasin, running as the "spamd" user.
+    spam = spamd
 
-  # accept otherwise
+  # Accept any other messages, but add spam headers.
   accept
+    add_header = X-Spam-Score: $spam_score ($spam_bar)
+    add_header = X-Spam-Report: $spam_report
+
+# vim: set sts=2 expandtab sw=2 ai: