spam.m4, user-spam.m4 (COMPATIBILITY): Don't split out prefix/suffix.

[exim-config] / user-spam.m4

diff --git a/user-spam.m4 b/user-spam.m4
index 4aaf352..ac1e7d0 100644 (file)
--- a/user-spam.m4
+++ b/user-spam.m4
@@ -25,6 +25,9 @@ DIVERT(null)
 ###--------------------------------------------------------------------------
 ### 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
@@ -36,8 +39,7 @@ SPAMLIMIT_ROUTER(fetch_spam_limit_lookup)
        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
@@ -45,8 +47,7 @@ SPAMLIMIT_ROUTER(fetch_spam_limit_userv)
        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 --------------------------------------------------