More regular logging use of H=<name> [<ip>]

Note this may affect utilities which parse logs.

5 files changed, 16 insertions, 7 deletions

diff --git a/test/mail/0211.CALLER b/test/mail/0211.CALLER
index cd5f25b1a..4a9257c25 100644
--- a/test/mail/0211.CALLER
+++ b/test/mail/0211.CALLER
@@ -17,8 +17,9 @@ A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
   userx@domain1
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after initial connection:
-  host 127.0.0.1 [127.0.0.1]: 550 Go away
+    550 Go away
 
 ------ This is a copy of the message, including all the headers. ------
 
@@ -53,11 +54,13 @@ A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
   usery@domain2
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after HELO the.local.host.name:
-  host 127.0.0.1 [127.0.0.1]: 550 Go away
+    550 Go away
   userx@domain1
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after HELO the.local.host.name:
-  host 127.0.0.1 [127.0.0.1]: 550 Go away
+    550 Go away
 
 ------ This is a copy of the message, including all the headers. ------
 
diff --git a/test/mail/0253.lmn b/test/mail/0253.lmn
index eeac8dc20..ad1f0e615 100644
--- a/test/mail/0253.lmn
+++ b/test/mail/0253.lmn
@@ -20,8 +20,9 @@ could not be delivered to one or more of its recipients. The following
 address(es) failed:
 
   fail@myhost.test.ex
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after RCPT TO:<fail@myhost.test.ex>:
-  host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
+    550 Recipient not OK
 
 ------ This is a copy of the message, including all the headers. ------
 
diff --git a/test/mail/0374.CALLER b/test/mail/0374.CALLER
index 36e4ef014..df8b523c7 100644
--- a/test/mail/0374.CALLER
+++ b/test/mail/0374.CALLER
@@ -19,8 +19,9 @@ A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
   d3@myhost.test.ex
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>:
-  host 127.0.0.1 [127.0.0.1]: 550 hard error
+    550 hard error
   b1@myhost.test.ex
     local delivery failed
 
diff --git a/test/mail/0375.CALLER b/test/mail/0375.CALLER
index 9fc9424a9..72ecd2295 100644
--- a/test/mail/0375.CALLER
+++ b/test/mail/0375.CALLER
@@ -18,8 +18,9 @@ A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
   e1@myhost.test.ex
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after RCPT TO:<e1@myhost.test.ex>:
-  host 127.0.0.1 [127.0.0.1]: 550 hard error
+    550 hard error
 
 ------ This is a copy of the message, including all the headers. ------
 
diff --git a/test/mail/0531.CALLER b/test/mail/0531.CALLER
index a35a78259..d945516b1 100644
--- a/test/mail/0531.CALLER
+++ b/test/mail/0531.CALLER
@@ -16,6 +16,7 @@ A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
   userx@test.ex
+  host 127.0.0.1 [127.0.0.1]
     LMTP error after DATA: 450 TEMPERROR: retry timeout exceeded
 
 ------ This is a copy of the message, including all the headers. ------
@@ -48,6 +49,7 @@ A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
   userx@retry.test.ex
+  host 127.0.0.1 [127.0.0.1]
     LMTP error after DATA: 450 TEMPERROR: retry timeout exceeded
 
 ------ This is a copy of the message, including all the headers. ------
@@ -81,8 +83,9 @@ A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
   userx@test.ex
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after RCPT TO:<userx@test.ex>:
-  host 127.0.0.1 [127.0.0.1]: 450 TEMPERROR: retry timeout exceeded
+    450 TEMPERROR: retry timeout exceeded
 
 ------ This is a copy of the message, including all the headers. ------