X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/exim-config/blobdiff_plain/48507a38f1410a43af1df681d593290a5e4bf038..31c922203e7c08f64c983044985d31d3470db13f:/spam.m4

diff --git a/spam.m4 b/spam.m4
index 4253e88..a8759a7 100644
--- a/spam.m4
+++ b/spam.m4
@@ -67,29 +67,6 @@ m4_define(<:SPAMLIMIT_USERV:>,
 SECTION(global, policy)m4_dnl
 spamd_address = CONF_spamd_address CONF_spamd_port
 
-SECTION(routers, allspam)m4_dnl
-## If we're verifying an address and the recipient has a `~/.mail/spam-limit'
-## file, then look up the recipient and sender addresses to find a plausible
-## limit and insert it into the `address_data' where the RCPT ACL can find
-## it.  This router always declines, so it doesn't affect the overall outcome
-## of the verification.
-SPAMLIMIT_ROUTER(fetch_spam_limit_lookup)
-	check_local_user
-	local_part_suffix = CONF_user_suffix_list
-	local_part_suffix_optional = true
-	SPAMLIMIT_LOOKUP(CONF_userconf_dir/spam-limit,
-		$local_part_prefix, $local_part, $local_part_suffix, $domain,
-		$sender_address)
-
-SPAMLIMIT_ROUTER(fetch_spam_limit_userv)
-	check_local_user
-	local_part_suffix = CONF_user_suffix_list
-	local_part_suffix_optional = true
-	condition = ${if exists{CONF_userconf_dir/spam-limit.userv}}
-	SPAMLIMIT_USERV(SHQUOTE($local_part),
-		$local_part_prefix, $local_part, $local_part_suffix, $domain,
-		$sender_address)
-
 SECTION(acl, rcpt-hooks)m4_dnl
 	## Do per-recipient spam-filter processing.
 	require	 acl = rcpt_spam
@@ -103,18 +80,26 @@ skip_spam_check:
 	accept	 hosts = +trusted
 	accept	 condition = ${if eq{$acl_c_mode}{submission}}
 
-	## If this is a virtual domain, and it says `spam-check=no', then
-	## skip.
-	accept	 domains = ${if exists{CONF_sysconf_dir/domains.conf} \
-			 {partial0-lsearch; CONF_sysconf_dir/domains.conf} \
-			 {}}
-		!condition = DOMKV(spam-check, {${expand:$value}}{true})
+	## If all domains have disabled spam checking then don't check.
+	accept	!condition = $acl_c_spam_check_domain
 
 	## Otherwise we should check.
 	deny
 
 rcpt_spam:
 
+	## If this is a virtual domain, and it says `spam-check=no', then we
+	## shouldn't check spam.  But we can't check domains at DATA time, so
+	## instead we must track whether all recipients have disabled
+	## checking.
+	warn	!domains = ${if exists{CONF_sysconf_dir/domains.conf} \
+			 {partial0-lsearch; CONF_sysconf_dir/domains.conf} \
+			 {}}
+		 set acl_c_spam_check_domain = true
+	warn	!condition = $acl_c_spam_check_domain
+		 condition = DOMKV(spam-check, {${expand:$value}}{true})
+		 set acl_c_spam_check_domain = true
+
 	## See if we should do this check.
 	accept	 acl = skip_spam_check