~mdw
/
exim-config
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vhost-local.m4: Fix missing newline.
[exim-config]
/
defs.m4
diff --git
a/defs.m4
b/defs.m4
index
289dd52
..
f83e2e6
100644
(file)
--- a/
defs.m4
+++ b/
defs.m4
@@
-28,12
+28,12
@@
m4_changecom(<:#:#:>)
### Output file preamble and postamble.
m4_divert(0)m4_dnl
### 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
###
### Exim configuration for distorted.org.uk.
m4_divert(1000)m4_dnl
-### GENERATED FROM exim
4.conf.m4
: DO NOT EDIT!
+### GENERATED FROM exim
-config/*.m4 (MODE)
: DO NOT EDIT!
m4_divert(-1)
###--------------------------------------------------------------------------
m4_divert(-1)
###--------------------------------------------------------------------------
@@
-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:>):>):>):>)
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
## 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
## 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)
<:$1:>):>)
## RENAME_HEADERS_REMOVE(list)
@@
-129,6
+136,12
@@
CLRSEP<::>FOREACH(<:\
m4_define(<:RENAME_HEADERS_REMOVE:>, <:m4_dnl
CLRSEP<::>FOREACH(<:SEP(:)$:><:1:>, <:$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
## LOOKUP_DOMAIN(dom, [if-found], [if-not-found])
##
## Look up DOM in the master domains file. If it's found, put the