chiark
/
gitweb
/
~mdw
/
exim-config
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
base.m4: Fix received line to report HELO names properly.
[exim-config]
/
base.m4
diff --git
a/base.m4
b/base.m4
index e779a1a8f9a3d2d1719b74ccfc2512b28250493e..e0d9979e83c755fe0d36b3aa842b208f7fda6088 100644
(file)
--- a/
base.m4
+++ b/
base.m4
@@
-59,11
+59,12
@@
gecos_pattern = ([^,:]*)
SECTION(global, incoming)m4_dnl
received_header_text = Received: \
SECTION(global, incoming)m4_dnl
received_header_text = Received: \
- ${if def:sender_rcvhost {from $sender_rcvhost\n\t} \
- {${if def:sender_ident \
- {from ${quote_local_part:$sender_ident} }}\
+ ${if def:sender_rcvhost \
+ {from $sender_rcvhost\
${if def:sender_helo_name \
${if def:sender_helo_name \
- {(helo=$sender_helo_name)\n\t}}}}\
+ { (helo=$sender_helo_name)}}\n\t} \
+ {${if def:sender_ident \
+ {from ${quote_local_part:$sender_ident} }}}}\
by $primary_hostname \
(Exim $version_number)\
${if def:tls_cipher {\n\t} { }}\
by $primary_hostname \
(Exim $version_number)\
${if def:tls_cipher {\n\t} { }}\