X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/ff58aaf82eac878ec33382788e2af0a12d53ba31..1dda4df9f8a4a6ff0d36ea1a7ee4648cb212e057:/user-spam.m4

diff --git a/user-spam.m4 b/user-spam.m4
index 1b47f15..29a7963 100644
--- a/user-spam.m4
+++ b/user-spam.m4
@@ -35,10 +35,10 @@ m4_define(<:USER_SPAMLIMIT_ROUTER:>,
 m4_define(<:USER_SPAMLIMIT_ROUTERS:>,
 <:USER_SPAMLIMIT_ROUTER(<:lookup:>, <:$1:>,
 	<:$5SPAMLIMIT_LOOKUP(<:CONF_userconf_dir/spam-limit:>,
-		<:$2:>, <:$3:>, <:$4:>):>)
+		<:$2:>, <:$3:>, <:$4:>, <:user=$local_part:>):>)
 USER_SPAMLIMIT_ROUTER(<:userv:>, <:$1:>,
-	<:$5SPAMLIMIT_USERV(<:SHQUOTE($local_part):>,
-		<:$2:>, <:$3:>, <:$4:>):>):>)
+	<:$5SPAMLIMIT_USERV(<:$local_part:>,
+		<:$2:>, <:$3:>, <:$4:>, <:user=$local_part:>):>):>)
 
 m4_define(<:CURRENT_LOCAL_PART:>,
 	<:$local_part_prefix$local_part$local_part_suffix:>)
@@ -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:>)