check_local_user
address_data = \
${if def:address_data {$address_data}{}} \
- ${if exists {CONF_userconf_dir/spam-limit} \
+ ${if and {{!eq{$acl_c_mode}{submission}} \
+ {exists {CONF_userconf_dir/spam-limit}}} \
{${lookup {$local_part_prefix\
$local_part\
$local_part_suffix\
@$domain/\
$sender_address} \
nwildlsearch {CONF_userconf_dir/spam-limit} \
- {spam_limit=$value} \
+ {${if match{$value}{\N^-?[0-9]+$\N} \
+ {spam_limit=$value} \
+ {}}} \
{}}} \
{}} \
- ${if exists {CONF_userconf_dir/spam-limit.userv} \
+ ${if and {{!eq{$acl_c_mode}{submission}} \
+ {exists {CONF_userconf_dir/spam-limit.userv}}} \
{${run {timeout 5s -- \
userv $local_part exim-spam-limit \
$sender_address \
$local_part \
$local_part_suffix \
@$domain} \
- {${if match{$value}{\N^[0-9]+$\N} \
+ {${if match{$value}{\N^-?[0-9]+$\N} \
{spam_limit=$value} \
{}}} \
{}}} \
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
+ ## necessary.
+ accept local_parts = postmaster
## Collect the user's spam threshold from the `address_data'
## variable, where it was left by the `fetch_spam_limit' router
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
## their scores. Leave `<<...>>' around everything else.
set acl_m_spam_tests = \
${sg{$acl_m_spam_tests} \
- {\N(?s)\n\s*([\d.]+)\s+([-\w]+)\s\N} \
+ {\N(?s)\n\s*(-?[\d.]+)\s+([-\w]+)\s\N} \
{>>\$2:\$1,<<}}
## Strip everything still in `<<...>>' pairs, including any