X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/75c86bd182115940b3613352b00af423e4c0743b..d057af07670fdbb5a2e7010b48bb103f7ca52c7a:/spam.m4

diff --git a/spam.m4 b/spam.m4
index a1134e5..18e4d17 100644
--- a/spam.m4
+++ b/spam.m4
@@ -53,15 +53,15 @@ m4_define(<:SPAMLIMIT_SET:>,
 
 m4_define(<:SPAMLIMIT_LOOKUP:>,
 	<:condition = ${if exists{$1}}
-	SPAMLIMIT_SET(<:${lookup {$2$3$4@$5/$6} nwildlsearch {$1} \
+	SPAMLIMIT_SET(<:${lookup {$2@$3/$4} nwildlsearch {$1} \
 			       {SPAMLIMIT_CHECK($value)}}:>):>)
 
 m4_define(<:SPAMLIMIT_USERV:>,
 	<:SPAMLIMIT_SET(<:${run {/usr/bin/timeout 5s \
 					userv CONF_userv_opts \
 					SHQUOTE($1) exim-spam-limit \
-					SHQUOTE($6) SHQUOTE($2) SHQUOTE($3) \
-					SHQUOTE($4) SHQUOTE(@$5)} \
+					SHQUOTE($4) \
+					SHQUOTE($2) SHQUOTE(@$3)} \
 				{SPAMLIMIT_CHECK($value)}}:>):>)
 
 SECTION(global, policy)m4_dnl