X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/09ca3919fb89a98386fc6863699ed5d7835373f1..aa935c91390b4ed5f4cab4e9d55e702bd828edfe:/spam.m4

diff --git a/spam.m4 b/spam.m4
index d1b7c50..350dcd2 100644
--- a/spam.m4
+++ b/spam.m4
@@ -77,6 +77,11 @@ rcpt_spam:
 	## If the client is trusted, don't bother with any of this.
 	accept	 hosts = +trusted
 
+	## Always accept mail to `postmaster'.  Currently this is not
+	## negotiable; maybe a tweak can be added to `domains.conf' if
+	## necessary.
+	accept	 local_parts = postmaster
+
 	## Collect the user's spam threshold from the `address_data'
 	## variable, where it was left by the `fetch_spam_limit' router
 	## during recipient verification.  (This just saves duplicating this
@@ -128,6 +133,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 = \
@@ -158,7 +164,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
@@ -181,7 +187,6 @@ data_spam:
 			limit=$acl_m_spam_limit_presentation, \n\t\
 			tests=$acl_m_spam_tests
 
-
 	## We're good.
 	accept