user-spam.m4: Fix indentation in the output.

[exim-config] / spam.m4

diff --git a/spam.m4 b/spam.m4
index 897e6a9501b832a9b9a2a9133f5eb8fea1e96eb4..c51bc36a390978b5a8aaabbd3455ffb1c9d0163a 100644 (file)
--- a/spam.m4
+++ b/spam.m4
@@ -49,20 +49,21 @@ m4_define(<:SPAMLIMIT_ROUTER:>,
 m4_define(<:SPAMLIMIT_SET:>,
        <:address_data = \
                ${if def:address_data {$address_data}{}} \
-               $1:>)
+               m4_ifelse(<:$2:>, <::>, <::>, <:$2 \
+               :>)$1:>)
 
 m4_define(<:SPAMLIMIT_LOOKUP:>,
        <:condition = ${if exists{$1}}
        SPAMLIMIT_SET(<:${lookup {$2@$3/$4} nwildlsearch {$1} \
-                              {SPAMLIMIT_CHECK($value)}}:>):>)
+                              {SPAMLIMIT_CHECK(<:$value:>)}}:>, <:$5:>):>)
 
 m4_define(<:SPAMLIMIT_USERV:>,
        <:SPAMLIMIT_SET(<:${run {/usr/bin/timeout 5s \
-                                       userv CONF_userv_opts \
+                                       /usr/bin/userv CONF_userv_opts \
                                        SHQUOTE($1) exim-spam-limit \
                                        SHQUOTE($4) \
                                        SHQUOTE($2) SHQUOTE(@$3)} \
-                               {SPAMLIMIT_CHECK($value)}}:>):>)
+                               {SPAMLIMIT_CHECK(<:$value:>)}}:>, <:$5:>):>)
 
 m4_define(<:GET_ADDRDATA:>,
        <:extract{<:$1:>}{${if def:address_data{$address_data}{}}}:>)
@@ -119,6 +120,14 @@ rcpt_spam:
                        ${sg {${GET_ADDRDATA(spam_limit){$value}{nil}}} \
                             {^(|.*\\D.*)\$}{CONF_spam_max}}
 
+       warn     condition = ${GET_ADDRDATA(user){true}{false}}
+                set acl_m_spam_users = \
+                       ${if def:acl_m_spam_users {$acl_m_spam_users::}{}}\
+                       ${GET_ADDRDATA(user) \
+                               {$value=${sg{$local_part@$domain}\
+                                           {([!:])}{!\$1}}} \
+                               fail}
+
        ## If there's a spam limit already established, and it's different
        ## from this user's limit, then the sender will have to try this user
        ## again later.
@@ -137,7 +146,7 @@ rcpt_spam:
        ## All done.
        accept
 
-SECTION(acl, data-spam)m4_dnl
+SECTION(acl, data-hooks)m4_dnl
        ## Do spam checking.
        require  acl = data_spam
 
@@ -200,8 +209,15 @@ data_spam:
                 ## Undo the escaping.
                 set acl_m_spam_tests = ${sg{$acl_m_spam_tests}{!(.)}{\$1}}
 
-       ## If we've decided to reject, then tell the sender to get knotted.
+       ## If we've decided to reject, then leave a dropping in the log file
+       ## so that users can analyse rejections for incoming messages, and
+       ## tell the sender to get knotted.
        deny     message = Tinned meat product detected ($spam_score)
+                log_message = Spam rejection \
+                       score=$spam_score \
+                       limit=$acl_m_spam_limit_presentation \
+                       tests=$acl_m_spam_tests \
+                       users=$acl_m_spam_users
                 condition = ${if >{$spam_score_int}{$acl_m_spam_limit} \
                                  {true}{false}}