base.m4: Twiddle received lines.

[exim-config] / spam.m4

diff --git a/spam.m4 b/spam.m4
index b219a28..350dcd2 100644 (file)
--- 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
@@ -159,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