X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/54c5ebb14ead7439af300e9d7d9d7d2ba29ff32e..67583e736a008a6106a0f4297a0e0df6a9b90c21:/test/rejectlog/0365?ds=inline

diff --git a/test/rejectlog/0365 b/test/rejectlog/0365
index 6dee64036..0686ea3b9 100644
--- a/test/rejectlog/0365
+++ b/test/rejectlog/0365
@@ -1,51 +1,59 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> rejected after DATA: '>' missing at end of address: failing address in "From" header is: <bad@syntax
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<> rejected after DATA: '>' missing at end of address: failing address in "From:" header is: <bad@syntax
 Envelope-from: <>
 Envelope-to: <x@y>
-P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
-	id 10HmaX-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+P Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
+	id 10HmaX-000000005vi-0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: <bad@syntax
-I Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+I Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
-1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
-P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
-	id 10HmaY-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+P Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
+	id 10HmaY-000000005vi-0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: bad@domain
-I Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+I Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
-1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error
+1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: Could not complete sender verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network Error
 1999-03-02 09:44:33 U=CALLER F=<callout@x> temporarily rejected RCPT <x@y>: Could not complete sender verify callout
-1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<nosyntax@x> rejected after DATA
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 U=CALLER F=<nosyntax@x> rejected after DATA
 Envelope-from: <nosyntax@x>
 Envelope-to: <x@y>
-P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <nosyntax@x>)
-	id 10HmaZ-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-000000005vi-0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: <bad@syntax
-I Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+I Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
-1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
-P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
-	id 10HmbA-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+P Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
+	id 10HmbA-000000005vi-0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: <unverifiable@y>
-I Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+I Message-Id: <E10HmbA-000000005vi-0000@the.local.host.name>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
-1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error
+1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: Could not complete recipient verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network Error
 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <cantverify.fail@y>: failure message
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <cantverify.defer@y>: defer message
-1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<> rejected after DATA: '>' missing at end of address: failing address in "From" header is: <bad@syntax
-1999-03-02 09:44:33 10HmbC-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
-1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 U=CALLER F=<> rejected after DATA: '>' missing at end of address: failing address in "From:" header is: <bad@syntax
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
+1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: Could not complete sender verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network Error
 1999-03-02 09:44:33 U=CALLER F=<callout@x> temporarily rejected RCPT <x@y>: Could not complete sender verify callout
-1999-03-02 09:44:33 10HmbD-0005vi-00 U=CALLER F=<nosyntax@x> rejected after DATA
-1999-03-02 09:44:33 10HmbE-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
-1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error
+1999-03-02 09:44:33 10HmbD-000000005vi-0000 U=CALLER F=<nosyntax@x> rejected after DATA
+1999-03-02 09:44:33 10HmbE-000000005vi-0000 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
+1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: Could not complete recipient verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network Error
 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <cantverify.fail@y>: failure message
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <cantverify.defer@y>: defer message