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 75b1c4c11b6240ce83da02f6f088bebb40e7b53d..9d0808803698b552c5be892ae3731f4b3368849d 100644 (file)
--- 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 \