From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 26 Jan 2014 13:19:42 +0000 (+0000)
Subject: spam.m4: Don't check submitted messages.
X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/commitdiff_plain/b8b0f13c28bdc666f939568fec998d0fa2f1e379

spam.m4: Don't check submitted messages.

Also, factor out the `do we check this' logic into a separate ACL,
because I got confused during testing and only modified one copy.
---

diff --git a/spam.m4 b/spam.m4
index 350dcd2..e480880 100644
--- a/spam.m4
+++ b/spam.m4
@@ -72,10 +72,21 @@ SECTION(acl, rcpt-hooks)m4_dnl
 	require	 acl = rcpt_spam
 
 SECTION(acl, misc)m4_dnl
-rcpt_spam:
+skip_spam_check:
 
-	## If the client is trusted, don't bother with any of this.
+	## If the client is trusted, or this is a new submission, don't
+	## bother with any of this.  We will have verified the sender
+	## fairly aggressively before granting this level of trust.
 	accept	 hosts = +trusted
+	accept	 condition = ${if eq{$acl_c_mode}{submission}}
+
+	## Otherwise we should check.
+	deny
+
+rcpt_spam:
+
+	## See if we should do this check.
+	accept	 acl = skip_spam_check
 
 	## Always accept mail to `postmaster'.  Currently this is not
 	## negotiable; maybe a tweak can be added to `domains.conf' if
@@ -118,8 +129,8 @@ SECTION(acl, data-spam)m4_dnl
 SECTION(acl, misc)m4_dnl
 data_spam:
 
-	## If the client is trusted, don't bother with any of this.
-	accept	 hosts = +trusted
+	## See if we should do this check.
+	accept	 acl = skip_spam_check
 
 	## Check header validity.
 	require	 verify = header_syntax