~mdw
/
exim-config
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sat-rewrite.m4: On satellite hosts, rewrite ADDR@HOST.distorted.org.uk.
[exim-config]
/
base.m4
diff --git
a/base.m4
b/base.m4
index
e0d9979
..
f8b2901
100644
(file)
--- a/
base.m4
+++ b/
base.m4
@@
-72,7
+72,7
@@
received_header_text = Received: \
{with $received_protocol \
${if def:tls_cipher {(cipher=$tls_cipher)}}}}\n\t\
${if def:sender_address \
{with $received_protocol \
${if def:tls_cipher {(cipher=$tls_cipher)}}}}\n\t\
${if def:sender_address \
- {(envelope-from
<$sender_address>
\
+ {(envelope-from
$sender_address
\
${if def:authenticated_id \
{; auth=$authenticated_id}})\n\t}}\
id $message_exim_id\
${if def:authenticated_id \
{; auth=$authenticated_id}})\n\t}}\
id $message_exim_id\
@@
-130,8
+130,8
@@
mail:
add_header = :after_received:X-Distorted-Warning: \
BADHELO \
Client's HELO doesn't match its IP address.\n\t\
add_header = :after_received:X-Distorted-Warning: \
BADHELO \
Client's HELO doesn't match its IP address.\n\t\
- HELO name
=
$sender_helo_name, \
- address
=
$sender_host_address
+ HELO name
=
$sender_helo_name, \
+ address
=
$sender_host_address
## Always allow the empty sender, so that we can receive bounces.
accept senders = :
## Always allow the empty sender, so that we can receive bounces.
accept senders = :
@@
-247,6
+247,15
@@
m4_define(<:FILTER_TRANSPORTS:>,
pipe_transport = pipe
reply_transport = reply:>)
pipe_transport = pipe
reply_transport = reply:>)
+m4_define(<:FILTER_ROUTER:>,
+<:$1_vrf:
+ $2
+ FILTER_VERIFY<::>$3
+$1:
+ $2
+ verify = no
+ FILTER_TRANSPORTS<::>$4:>)
+
DIVERT(null)
###--------------------------------------------------------------------------
### Some standard transports.
DIVERT(null)
###--------------------------------------------------------------------------
### Some standard transports.