defs.m4: Remove spurious initial space.

[exim-config] / spam.m4

diff --git a/spam.m4 b/spam.m4
index 9b7fe0d..a1134e5 100644 (file)
--- 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
@@ -228,13 +205,13 @@ data_spam:
                 set acl_m_spam_tests = ${sg{$acl_m_spam_tests}{!(.)}{\$1}}
 
                 ## Insert the headers.
-                add_header = X-SpamAssassin-Score: \
+                ADD_HEADER(<:X-CONF_header_token-SpamAssassin-Score: \
                        $spam_score/$acl_m_spam_limit_presentation \
-                       ($spam_bar)
-                add_header = X-SpamAssassin-Status: \
+                       ($spam_bar):>)
+                ADD_HEADER(<:X-CONF_header_token-SpamAssassin-Status: \
                        score=$spam_score, \
                        limit=$acl_m_spam_limit_presentation, \n\t\
-                       tests=$acl_m_spam_tests
+                       tests=$acl_m_spam_tests:>)
 
        ## We're good.
        accept