X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/33dbcec9dca3a8bb70405fb2f13fbc032c517b02..8afec8982a03946c92b3bde00ac5776fed9bc197:/user-spam.m4 diff --git a/user-spam.m4 b/user-spam.m4 index 42b6f15..29a7963 100644 --- a/user-spam.m4 +++ b/user-spam.m4 @@ -37,7 +37,7 @@ m4_define(<:USER_SPAMLIMIT_ROUTERS:>, <:$5SPAMLIMIT_LOOKUP(<:CONF_userconf_dir/spam-limit:>, <:$2:>, <:$3:>, <:$4:>, <:user=$local_part:>):>) USER_SPAMLIMIT_ROUTER(<:userv:>, <:$1:>, - <:$5SPAMLIMIT_USERV(<:SHQUOTE($local_part):>, + <:$5SPAMLIMIT_USERV(<:$local_part:>, <:$2:>, <:$3:>, <:$4:>, <:user=$local_part:>):>):>) m4_define(<:CURRENT_LOCAL_PART:>, @@ -60,11 +60,11 @@ SECTION(routers, allspam)m4_dnl USER_SPAMLIMIT_ROUTERS(<:original:>, <:$original_local_part:>, <:$original_domain:>, <:$sender_address:>, <:condition = ${if !eq{ORIGINAL_ADDRESS}{PARENT_ADDRESS}} -:>) + :>) USER_SPAMLIMIT_ROUTERS(<:parent:>, <:$parent_local_part:>, <:$parent_domain:>, <:$sender_address:>, <:condition = ${if !eq{PARENT_ADDRESS}{CURRENT_ADDRESS}} -:>) + :>) USER_SPAMLIMIT_ROUTERS(<:current:>, <:CURRENT_LOCAL_PART:>, <:$domain:>, <:$sender_address:>)