X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/185b5456076ca86959643ce2f19c98c0f82f281e..352b0392cb511b53e998654429688f91cd5c53db:/spam.m4

diff --git a/spam.m4 b/spam.m4
index 705fbee..b20b7e0 100644
--- a/spam.m4
+++ b/spam.m4
@@ -116,6 +116,9 @@ data_spam:
 	## If the client is trusted, don't bother with any of this.
 	accept	 hosts = +trusted
 
+	## Check header validity.
+	require	 verify = header_syntax
+
 	## Check the message for spam, comparing to the configured limit.
 	deny	 spam = exim:true
 		 message = Tinned meat product detected ($spam_score)
@@ -125,6 +128,7 @@ data_spam:
 	## Insert headers from the spam check now that we've decided to
 	## accept the message.
 	warn
+
 		 ## Convert the limit (currently 10x fixed point) into a
 		 ## decimal for presentation.
 		 set acl_m_spam_limit_presentation = \
@@ -155,7 +159,7 @@ data_spam:
 		 ## their scores.  Leave `<<...>>' around everything else.
 		 set acl_m_spam_tests = \
 			${sg{$acl_m_spam_tests} \
-			    {\N(?s)\n\s*([\d.]+)\s+([-\w]+)\s\N} \
+			    {\N(?s)\n\s*(-?[\d.]+)\s+([-\w]+)\s\N} \
 			    {>>\$2:\$1,<<}}
 
 		 ## Strip everything still in `<<...>>' pairs, including any
@@ -178,7 +182,6 @@ data_spam:
 			limit=$acl_m_spam_limit_presentation, \n\t\
 			tests=$acl_m_spam_tests
 
-
 	## We're good.
 	accept