Fix bounce generation under RFC 3461 request. Bug 2411

[exim.git] / test / stdout / 2150

diff --git a/test/stdout/2150 b/test/stdout/2150
index dd1bdaef8287f5cce1982beb6083478a0108c94b..8636d3b0096da739c12da87d2d0f805abc2765d8 100644 (file)
--- a/test/stdout/2150
+++ b/test/stdout/2150
@@ -7,37 +7,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-

-<<< 250-PIPELINING
-??? 250-
-<<< 250-STARTTLS
-??? 250
-<<< 250 HELP
->>> starttls
-??? 220
-<<< 220 TLS go ahead
-Attempting to start TLS
-Succeeded in starting TLS
->>> mail from:<userx@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@test.ex>
-??? 250
-<<< 250 Accepted
->>> data
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> This is a test message.
->>> .
-+++ 1
-End of script
-Connecting to 127.0.0.1 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> ehlo abcd
-??? 250-
-<<< 250-myhost.test.ex Hello abcd [127.0.0.1]
-??? 250-
-<<< 250-SIZE 52428800
+<<< 250-8BITMIME

 ??? 250-
 <<< 250-PIPELINING
 ??? 250-
 ??? 250-
 <<< 250-PIPELINING
 ??? 250-


@@ -48,6 +18,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

+SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250
 Succeeded in starting TLS
 >>> mail from:<userx@test.ex>
 ??? 250


@@ -59,6 +30,6 @@ Succeeded in starting TLS
 ??? 354
 <<< 354 Enter message, ending with "." on a line by itself
 >>> This is a test message.
 ??? 354
 <<< 354 Enter message, ending with "." on a line by itself
 >>> This is a test message.

->>> .\r\nrset
+>>> .

 +++ 1
 End of script
 +++ 1
 End of script