Testsuite: fix Recieved: header munging for TLS info

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

diff --git a/test/stdout/4201 b/test/stdout/4201
index 2baa6661c70234c93a5546c557050973b46300b4..9c95da74ed3e9f89ca1d5ecc97104ad9f0df9356 100644 (file)
--- a/test/stdout/4201
+++ b/test/stdout/4201
@@ -28,7 +28,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> body
 >>> .
 ??? 250
-<<< 250 OK id=10HmaX-0005vi-00
+<<< 250 OK id=10HmaZ-0005vi-00
 >>> QUIT
 ??? 221
 <<< 221 the.local.host.name closing connection
@@ -63,7 +63,22 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> body
 >>> .
 ??? 250
-<<< 250 OK id=10HmaY-0005vi-00
+<<< 250 OK id=10HmbA-0005vi-00
+>>> MAIL FROM: <ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com> SMTPUTF8
+??? 250
+<<< 250 OK
+>>> RCPT TO: <usery@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> Subject: test
+>>> 
+>>> body
+>>> .
+??? 250
+<<< 250 OK id=10HmbB-0005vi-00
 >>> QUIT
 ??? 221
 <<< 221 the.local.host.name closing connection
@@ -78,131 +93,26 @@ End of script
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaZ-0005vi-00\r
-221 the.local.host.name closing connection\r
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
-250-the.local.host.name Hello CALLER at client.ffail\r
-250-SIZE 52428800\r
-250-8BITMIME\r
-250-PIPELINING\r
-250-SMTPUTF8\r
-250 HELP\r
-250 OK\r
-250 Accepted\r
-354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbH-0005vi-00\r
-221 the.local.host.name closing connection\r
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
-250-the.local.host.name Hello CALLER at client.bh\r
-250-SIZE 52428800\r
-250-8BITMIME\r
-250-PIPELINING\r
-250-SMTPUTF8\r
-250 HELP\r
-250 OK\r
-250 Accepted\r
-354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbJ-0005vi-00\r
-221 the.local.host.name closing connection\r
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
-250-the.local.host.name Hello CALLER at client.bh\r
-250-SIZE 52428800\r
-250-8BITMIME\r
-250-PIPELINING\r
-250-SMTPUTF8\r
-250 HELP\r
-250 OK\r
-250 Accepted\r
-354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbL-0005vi-00\r
-221 the.local.host.name closing connection\r
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
-250-the.local.host.name Hello CALLER at client.ffail\r
-250-SIZE 52428800\r
-250-8BITMIME\r
-250-PIPELINING\r
-250-SMTPUTF8\r
-250 HELP\r
-250 OK\r
-533 mailbox name not allowed\r
-221 the.local.host.name closing connection\r
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
-250-the.local.host.name Hello CALLER at client.ffail\r
-250-SIZE 52428800\r
-250-8BITMIME\r
-250-PIPELINING\r
-250-SMTPUTF8\r
-250 HELP\r
-250 OK\r
-533 mailbox name not allowed\r
-221 the.local.host.name closing connection\r
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
-250-the.local.host.name Hello CALLER at client.bh\r
-250-SIZE 52428800\r
-250-8BITMIME\r
-250-PIPELINING\r
-250-SMTPUTF8\r
-250 HELP\r
-250 OK\r
-250 Accepted\r
-354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbN-0005vi-00\r
-221 the.local.host.name closing connection\r
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
-250-the.local.host.name Hello CALLER at client.bh\r
-250-SIZE 52428800\r
-250-8BITMIME\r
-250-PIPELINING\r
-250-SMTPUTF8\r
-250 HELP\r
-250 OK\r
-250 Accepted\r
-354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbP-0005vi-00\r
-221 the.local.host.name closing connection\r
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
-250-the.local.host.name Hello CALLER at client.bh\r
-250-SIZE 52428800\r
-250-8BITMIME\r
-250-PIPELINING\r
-250-SMTPUTF8\r
-250 HELP\r
-250 OK\r
-250 Accepted\r
-354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbR-0005vi-00\r
-221 the.local.host.name closing connection\r
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
-250-the.local.host.name Hello CALLER at client.sfail\r
-250-SIZE 52428800\r
-250-8BITMIME\r
-250-PIPELINING\r
-250-SMTPUTF8\r
-250 HELP\r
-250 OK\r
-550-Callback setup failed while verifying <userA@test.ex>\r
-550-533 mailbox name not allowed\r
-550-The initial connection, or a HELO or MAIL FROM:<> command was\r
-550-rejected. Refusing MAIL FROM:<> does not help fight spam, disregards\r
-550-RFC requirements, and stops you from receiving standard bounce\r
-550-messages. This host does not accept mail from domains whose servers\r
-550-refuse bounces.\r
-550 Sender verify failed\r
-221 the.local.host.name closing connection\r
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
-250-the.local.host.name Hello CALLER at client.sfail\r
-250-SIZE 52428800\r
-250-8BITMIME\r
-250-PIPELINING\r
-250-SMTPUTF8\r
-250 HELP\r
-250 OK\r
-550-Callback setup failed while verifying <userB.જેઠીમધ@test.ex>\r
-550-533 mailbox name not allowed\r
-550-The initial connection, or a HELO or MAIL FROM:<> command was\r
-550-rejected. Refusing MAIL FROM:<> does not help fight spam, disregards\r
-550-RFC requirements, and stops you from receiving standard bounce\r
-550-messages. This host does not accept mail from domains whose servers\r
-550-refuse bounces.\r
-550 Sender verify failed\r
+250 OK id=10HmaX-0005vi-00\r
 221 the.local.host.name closing connection\r
+Connecting to 127.0.0.1 port 1225 ... connected
+??? 220
+<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> EHLO client
+??? 250-
+<<< 250-the.local.host.name Hello client [127.0.0.1]
+??? 250-SIZE
+<<< 250-SIZE 52428800
+??? 250-8BITMIME
+<<< 250-8BITMIME
+??? 250-PIPELINING
+<<< 250-PIPELINING
+??? 250 HELP
+<<< 250 HELP
+>>> MAIL FROM: <someone@some.domain> SMTPUTF8
+??? 501
+<<< 501 SMTPUTF8 used when not advertised
+>>> QUIT
+??? 221
+<<< 221 the.local.host.name closing connection
+End of script