Testsuite: munge for Cyrus SASL library version output changes

[exim.git] / test / stdout / 5402

diff --git a/test/stdout/5402 b/test/stdout/5402
index c0548bae7cfbc9f6a18b12b683609145fec091a6..629aa4330b8c234d6e14e7c411a3a26241d9917b 100644 (file)
--- a/test/stdout/5402
+++ b/test/stdout/5402
@@ -1,29 +1,14 @@
-
-**** SMTP testing session as if from host 1.2.3.4
-**** 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
-250-myhost.test.ex Hello myhost.test.ex [1.2.3.4]\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
-354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaX-0005vi-00\r
-
-**** SMTP testing: that is not a real message id!
-
 221 myhost.test.ex closing connection\r
-
-**** SMTP testing session as if from host 1.2.3.4
-**** 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
-250-myhost.test.ex Hello myhost.test.ex [1.2.3.4]\r
+250-myhost.test.ex Hello CALLER at myhost.test.ex\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
@@ -31,25 +16,45 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaY-0005vi-00\r
-
-**** SMTP testing: that is not a real message id!
-
+250 OK id=10HmaX-0005vi-00\r
 221 myhost.test.ex closing connection\r
 
 ******** SERVER ********
 Listening on port 1224 ... 
-Server timed out
-Listening on port 1224 ... 
 Connection request from [ip4.ip4.ip4.ip4]
-220 server ready
+220 ESMTP
 EHLO myhost.test.ex
 250 OK
 MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<dest@domain.com>
+250 Recipient OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [ip4.ip4.ip4.ip4]
+220 ESMTP
+EHLO myhost.test.ex
 250 OK
-RCPT TO:<verify@domain.com>
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<dest@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 10HmaX-0005vi-00
+       for dest@domain.com;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
 250 OK
 QUIT
-220 OK
-Expected EOF read from client
+250 OK
 End of script