m4_define(<:SPAMLIMIT_LOOKUP:>,
<:condition = ${if exists{$1}}
- SPAMLIMIT_SET(<:${lookup {$2$3$4@$5/$6} nwildlsearch {$1} \
+ SPAMLIMIT_SET(<:${lookup {$2@$3/$4} nwildlsearch {$1} \
{SPAMLIMIT_CHECK($value)}}:>):>)
m4_define(<:SPAMLIMIT_USERV:>,
<:SPAMLIMIT_SET(<:${run {/usr/bin/timeout 5s \
userv CONF_userv_opts \
SHQUOTE($1) exim-spam-limit \
- SHQUOTE($6) SHQUOTE($2) SHQUOTE($3) \
- SHQUOTE($4) SHQUOTE(@$5)} \
+ SHQUOTE($4) \
+ SHQUOTE($2) SHQUOTE(@$3)} \
{SPAMLIMIT_CHECK($value)}}:>):>)
SECTION(global, policy)m4_dnl
###--------------------------------------------------------------------------
### User-configurable spam thresholds.
+m4_define(<:CURRENT_LOCAL_PART:>,
+ <:$local_part_prefix$local_part$local_part_suffix:>)
+
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
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)
+ CURRENT_LOCAL_PART, $domain, $sender_address)
SPAMLIMIT_ROUTER(fetch_spam_limit_userv)
check_local_user
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)
+ CURRENT_LOCAL_PART, $domain, $sender_address)
DIVERT(null)
###----- That's all, folks --------------------------------------------------
VHOST
condition = DOMKV(spam-limit-file, {true}{false})
SPAMLIMIT_LOOKUP(DOMKV(spam-limit-file),
- , $local_part,, $domain, $sender_address)
+ $local_part, $domain, $sender_address)
SPAMLIMIT_ROUTER(virtual_spam_limit_userv)
VHOST
condition = DOMKV(spam-limit-userv, {true}{false})
- SPAMLIMIT_USERV(DOMKV(spam-limit-userv),, $local_part,,
- $domain, $sender_address)
+ SPAMLIMIT_USERV(DOMKV(spam-limit-userv),
+ $local_part, $domain, $sender_address)
SECTION(routers, virtual-tail)m4_dnl
## Last ditch effort for required local parts. This is a bit strange because