DMARC: Avoid using Resent-From: header. Bug 3029

[exim.git] / test / stdout / 4031

diff --git a/test/stdout/4031 b/test/stdout/4031
index a0cddc62ddc98e4866fa42aa616ff2136662c77f..1c697238d0c0f1d1ef1a15b6e9a6c43381009ce2 100644 (file)
--- a/test/stdout/4031
+++ b/test/stdout/4031
@@ -9,7 +9,7 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaX-0005vi-00\r
+250 OK id=10HmaX-000000005vi-0000\r
 
 **** SMTP testing: that is not a real message id!
 
@@ -25,7 +25,7 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaY-0005vi-00\r
+250 OK id=10HmaY-000000005vi-0000\r
 
 **** SMTP testing: that is not a real message id!
 
@@ -41,13 +41,23 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaZ-0005vi-00\r
+250 OK id=10HmaZ-000000005vi-0000\r
 
 **** SMTP testing: that is not a real message id!
 
+221 myhost.test.ex closing connection\r
+### proxy timeout
+
+**** SMTP testing session as if from host ip4.ip4.ip4.ip4
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+503 Command refused, required Proxy negotiation failed\r
 221 myhost.test.ex closing connection\r
 
 ******** SERVER ********
 ### non-prox plain receive
 ### protocol v1 receive
 ### protocol v2 receive
+### proxy timeout