X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/33abb52060c6a939ea3f1f31b4b2fda21bdfc56a..5918499b6e7746f49aa8ba9ae1f058d2b48bda47:/spam.m4

diff --git a/spam.m4 b/spam.m4
index 5ce660b..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
@@ -205,13 +205,13 @@ data_spam:
 		 set acl_m_spam_tests = ${sg{$acl_m_spam_tests}{!(.)}{\$1}}
 
 		 ## Insert the headers.
-		 add_header = X-Distorted-SpamAssassin-Score: \
+		 ADD_HEADER(<:X-CONF_header_token-SpamAssassin-Score: \
 			$spam_score/$acl_m_spam_limit_presentation \
-			($spam_bar)
-		 add_header = X-Distorted-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