X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/2709ca2632f61d2ebcdf5ef2040b5b7068fd6a96..61eafb6e40889a60ea293bed4da9471112f173a7:/test/rejectlog/0026?ds=sidebyside

diff --git a/test/rejectlog/0026 b/test/rejectlog/0026
index 2d97471f9..5f71734a6 100644
--- a/test/rejectlog/0026
+++ b/test/rejectlog/0026
@@ -1,50 +1,74 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
 Envelope-from: <x@y>
 Envelope-to: <x@y>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <x@y>)
-	id 10HmaX-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+	id 10HmaX-000000005vi-0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: @
-1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
-Envelope-from: <>
+I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 U=CALLER F=<x@y> rejected after DATA: '>' missing at end of address: failing address in "To:" header is: <dummy@gmail.com
+Envelope-from: <x@y>
 Envelope-to: <x@y>
-P Received: from CALLER by myhost.test.ex 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 myhost.test.ex with local-smtp (Exim x.yz)
+	(envelope-from <x@y>)
+	id 10HmaY-000000005vi-0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
+T To: <dummy@gmail.com
+  Subject: incomprehensible
+F From: <forged@sender.com
+I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-F From: <x@y>, @
-1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
 Envelope-from: <>
 Envelope-to: <x@y>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
-	id 10HmaZ-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+P Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
+	id 10HmaZ-000000005vi-0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
+F From: <x@y>, @
+I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+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 (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
+	id 10HmbA-000000005vi-0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: <x@y>
+I Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
   X-warning: this is a test warning
-1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<x@y> rejected after DATA: body contains trigger
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 U=CALLER F=<x@y> rejected after DATA: body contains trigger
 Envelope-from: <x@y>
 Envelope-to: <x@y>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <x@y>)
-	id 10HmbA-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
+	id 10HmbB-000000005vi-0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex>
 F From: x@y
-1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <userx@test.ex>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
-	id 10HmbB-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+P Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
+	id 10HmbC-000000005vi-0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 T to: group name: x@y, p@q;
 R reply-to: group name:;
+I Message-Id: <E10HmbC-000000005vi-0000@myhost.test.ex>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
   X-warning: this is a test warning