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

[users/jgh/exim.git] / test / stdout / 0474

diff --git a/test/stdout/0474 b/test/stdout/0474
index 3b852fea250f183402b24f461925321e09746449..f00a7d80b782c437e7f4cfaacfc66d9a1fd436c6 100644 (file)
--- a/test/stdout/0474
+++ b/test/stdout/0474
@@ -1,11 +1,11 @@
 +++++++++++++++++++++++++++
 +++++++++++++++++++++++++++

-  T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after end of data: host 127.0.0.1 [127.0.0.1]: 850 NONSENSE
+  T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 850 NONSENSE

 first failed = time last try = time2 next try = time2 + 10
 +++++++++++++++++++++++++++
 first failed = time last try = time2 next try = time2 + 10
 +++++++++++++++++++++++++++

-  T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH
+  T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 850 RUBBISH

 first failed = time last try = time2 next try = time2 + 10
 +++++++++++++++++++++++++++
 first failed = time last try = time2 next try = time2 + 10
 +++++++++++++++++++++++++++

-  R:abcd@xyz:<CALLER@the.local.host.name> -44 12865 SMTP error from remote mail server after RCPT TO:<abcd@xyz>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH
+  R:abcd@xyz:<CALLER@the.local.host.name> -44 12865 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<abcd@xyz>: 850 RUBBISH

 first failed = time last try = time2 next try = time2 + 10
 
 ******** SERVER ********
 first failed = time last try = time2 next try = time2 + 10
 
 ******** SERVER ********


@@ -24,9 +24,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
        id 10HmaX-0005vi-00
        for abcd@xyz; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@the.local.host.name>)
        id 10HmaX-0005vi-00
        for abcd@xyz; Tue, 2 Mar 1999 09:44:33 +0000

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>

+Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test data.
 .
 
 Test data.
 .