X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/17553a31d6069e8ff8e4dee0cec6d4740f68e6ae..61295d9c46bb3639fe3140ed645da5313d95e66f:/exchange.m4 diff --git a/exchange.m4 b/exchange.m4 index fe79ce3..b4cb02b 100644 --- a/exchange.m4 +++ b/exchange.m4 @@ -52,12 +52,11 @@ mail_client_addr: {${if match_domain {$sender_address_domain} \ {+public} \ {+allnets}{! +allnets}}})} - ADD_HEADER(<:X-CONF_header_token-Warning: \ - RCLNTLSNDR \ - Apparently local sender, but received from remote \ - server.\n\t\ - sender=$sender_address \ - host=$sender_host_address:>) + WARNING_HEADER(RCLNTLSNDR, + <:Apparently local sender, but received from remote \ + server.\n\t\ + sender=$sender_address \ + host=$sender_host_address:>) ## OK. accept @@ -67,8 +66,7 @@ DIVERT(null) ### Rename locally-meaningful headers in mail from outside. m4_define(<:DISTORTED_HEADERS:>, -<:X-CONF_header_token-Warning, -X-CONF_header_token-SpamAssassin-Score, +<:X-CONF_header_token-SpamAssassin-Score, X-CONF_header_token-SpamAssassin-Status:>) SECTION(acl, data)m4_dnl