From 2cf9db84297dea507a8ec503b3bba60c6adb31f8 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 4 Feb 2014 18:04:52 +0000
Subject: [PATCH] base.m4: Fix received line to report HELO names properly.

---
 base.m4 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/base.m4 b/base.m4
index e779a1a..e0d9979 100644
--- a/base.m4
+++ b/base.m4
@@ -59,11 +59,12 @@ gecos_pattern = ([^,:]*)
 
 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 \
-		   {(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} { }}\
-- 
2.11.0