### Output file preamble and postamble.
m4_divert(0)m4_dnl
-### -*-conf-*- GENERATED FROM /etc/mail/m4/*.m4: DO NOT EDIT!
+### -*-conf-*- GENERATED FROM exim-config/*.m4 (MODE) DO NOT EDIT!
###
### Exim configuration for distorted.org.uk.
m4_divert(1000)m4_dnl
-### GENERATED FROM exim4.conf.m4: DO NOT EDIT!
+### GENERATED FROM exim-config/*.m4 (MODE): DO NOT EDIT!
m4_divert(-1)
###--------------------------------------------------------------------------
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
## 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(<:\
+FOREACH(<:\
${if def:h_$:><:1:{X-CONF_header_token-Renamed-$:><:1: $h_$:><:1:\n}}:>,
<:$1:>):>)
m4_define(<:RENAME_HEADERS_REMOVE:>, <:m4_dnl
CLRSEP<::>FOREACH(<:SEP(:)$:><:1:>, <:$1:>):>)
+## WARNING_HEADER(tag, msg)
+##
+## Add a warning header to the current mesage.
+m4_define(<:WARNING_HEADER:>,
+<:add_header = X-CONF_header_token-Warning: $1 $2:>)
+
## LOOKUP_DOMAIN(dom, [if-found], [if-not-found])
##
## Look up DOM in the master domains file. If it's found, put the