Testsuite: move ACL-triggered debug output to stderr file, and munge

[exim.git] / test / stdout / 0565

diff --git a/test/stdout/0565 b/test/stdout/0565
index be4e455941a34a72d1e2701de4c3c4485babfbba..bb366149e368f3fad9d24456bc51346ea934bde0 100644 (file)
--- a/test/stdout/0565
+++ b/test/stdout/0565
@@ -1,10 +1,12 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello CALLER at test\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello CALLER at test\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
@@ -24,10 +26,12 @@ RCPT TO:<x@y>
 250 Receiver OK
 DATA
 354 Send it
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
-       for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+       for x@y;
+       Tue, 2 Mar 1999 09:44:33 +0000
 From: postmaster@y
 To: x@y
 Subject: first test message
@@ -53,10 +57,12 @@ RCPT TO:<x@test.ex>
 250 Receiver OK
 DATA
 354 Send it
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
-       for x@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for x@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 From: postmaster@y
 To: x@y
 Subject: second test message