Merge 4.80.1 security fix in.

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

diff --git a/test/stdout/5400 b/test/stdout/5400
index a6c813be34e889e71b3373c8203bb17dee0a0ea0..74c2d235880815c38e94028bea36595666a30e22 100644 (file)
--- a/test/stdout/5400
+++ b/test/stdout/5400
@@ -1,6 +1,7 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at myhost.test.ex\r
 250-SIZE 52428800\r
+250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250 OK\r
@@ -11,20 +12,32 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at myhost.test.ex\r
 250-SIZE 52428800\r
+250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
-250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaY-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 myhost.test.ex\r
+250-SIZE 52428800\r
+250-8BITMIME\r
+250-PIPELINING\r
+250 HELP\r
+250 OK\r
+250 Accepted\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmaZ-0005vi-00\r
+221 myhost.test.ex closing connection\r
 
 ******** SERVER ********
 Listening on port 1224 ... 
 Connection request from [ip4.ip4.ip4.ip4]
 220 ESMTP
-HELO myhost.test.ex
+EHLO myhost.test.ex
 250 OK
 MAIL FROM:<CALLER@myhost.test.ex>
 250 Sender OK
@@ -43,18 +56,36 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
-Unexpected EOF read from client
+QUIT
+250 OK
+End of script
 Listening on port 1224 ... 
 Connection request from [ip4.ip4.ip4.ip4]
-220 ESMTP
+220 SMTP only spoken here
+EHLO myhost.test.ex
+550 Not here, mate
 HELO myhost.test.ex
 250 OK
 MAIL FROM:<CALLER@myhost.test.ex>
 250 Sender OK
-RCPT TO:<userx@domain.com>
+RCPT TO:<userz@domain.com>
 250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER (helo=myhost.test.ex)
+       by myhost.test.ex with local-esmtp (Exim x.yz)
+       (envelope-from <CALLER@myhost.test.ex>)
+       id 10HmaY-0005vi-00
+       for userz@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
 QUIT
-Expected EOF read from client
+250 OK
+End of script
 Listening on port 1224 ... 
 Connection request from [ip4.ip4.ip4.ip4]
 220 ESMTP
@@ -62,17 +93,28 @@ EHLO myhost.test.ex
 250 OK
 MAIL FROM:<CALLER@myhost.test.ex>
 250 Sender OK
-RCPT TO:<userx@domain.com>
+RCPT TO:<usery@domain.com>
 250 Recipient OK
+QUIT
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [ip4.ip4.ip4.ip4]
+220 ESMTP
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
 RCPT TO:<usery@domain.com>
 250 Recipient OK
+RCPT TO:<userx@domain.com>
+250 Recipient OK
 DATA
 354 Send data
 Received: from CALLER (helo=myhost.test.ex)
        by myhost.test.ex with local-esmtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+       id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000