From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 26 Jan 2014 05:23:33 +0000 (+0000)
Subject: base.m4: Twiddle received lines.
X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/commitdiff_plain/b92689d6fc9ca734ea3bc99cbc144d9e244168f4

base.m4: Twiddle received lines.

Now we don't have the version comment on its own line if we received
with TLS.  The code's a bit uglier (because of the repeated
${if def:tls_cipher ...}) but the output is much neater.
---

diff --git a/base.m4 b/base.m4
index 75b1c4c..9d08088 100644
--- a/base.m4
+++ b/base.m4
@@ -65,10 +65,11 @@ received_header_text = Received: \
 	      ${if def:sender_helo_name \
 		   {(helo=$sender_helo_name)\n\t}}}}\
 	by $primary_hostname \
+	(Exim $version_number)\
+	${if def:tls_cipher {\n\t} { }}\
 	${if def:received_protocol \
 	     {with $received_protocol \
-	      ${if def:tls_cipher {(cipher=$tls_cipher)\n\t}}}}\
-	(Exim $version_number)\n\t\
+	      ${if def:tls_cipher {(cipher=$tls_cipher)}}}}\n\t\
 	${if def:sender_address \
 	     {(envelope-from <$sender_address>\
 	      ${if def:authenticated_id \