Delay ACL header edits until transport time.

[exim-config] / defs.m4

diff --git a/defs.m4 b/defs.m4
index 289dd520025fe9f31a04e7a1708e085aedd16024..370c2d31a11a76c081db311a7b7e0567f93e7a5d 100644 (file)
--- a/defs.m4
+++ b/defs.m4
@@ -112,6 +112,13 @@ m4_ifdef(<:_done:$1/$2:>, <::>, <:m4_dnl
 m4_ifdef(<:_head:$1/$2:>, <:<:##:> m4_indir(<:_head:$1/$2:>)
 :>)m4_define(<:_done:$1/$2:>):>):>):>)
 
+## ADD_HEADER(hdrs)
+##
+## An ACL action to add the given HDRS, which are a `\n'-terminated list of
+## new header lines.
+m4_define(<:ADD_HEADER:>, <:m4_dnl
+ set   acl_m_hdradd = ${if def:acl_m_hdradd{$acl_m_hdradd}{}}$1\n:>)
+
 ## RENAME_HEADERS_ADD(list)
 ##
 ## Return a newline-separated list of message header additions of the form
@@ -119,8 +126,8 @@ m4_ifdef(<:_head:$1/$2:>, <:<:##:> m4_indir(<:_head:$1/$2:>)
 ## for each HEADER in the LIST which appears in the current message, where
 ## VALUE is the HEADER's current value.
 m4_define(<:RENAME_HEADERS_ADD:>, <:m4_dnl
-CLRSEP<::>FOREACH(<:\
-       ${if def:h_$:><:1:{X-Distorted-Renamed-$:><:1: $h_$:><:1:\n}}:>,
+FOREACH(<:\
+       ${if def:h_$:><:1:{X-CONF_header_token-Renamed-$:><:1: $h_$:><:1:\n}}:>,
        <:$1:>):>)
 
 ## RENAME_HEADERS_REMOVE(list)