Delay ACL header edits until transport time.

[exim-config] / spam.m4

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