Testsuite: Fix 608

[exim.git] / test / stdout / 0904

diff --git a/test/stdout/0904 b/test/stdout/0904
index a19787d120f0caa620691a5d5864e5c7799cff72..52f93b9ed9e3b1c22df30cb836a3070f9355c78b 100644 (file)
--- a/test/stdout/0904
+++ b/test/stdout/0904
@@ -10,7 +10,7 @@ MAIL FROM:<>
 250 OK
 RCPT TO:<a@test.ex>
 250 OK
 250 OK
 RCPT TO:<a@test.ex>
 250 OK

-BDAT 329 LAST
+BDAT 331 LAST

 250 OK
 QUIT
 225 OK
 250 OK
 QUIT
 225 OK


@@ -26,8 +26,8 @@ MAIL FROM:<>
 250 good mail cmd
 RCPT TO:<b@test.ex>
 250 acceptable rcpt cmd
 250 good mail cmd
 RCPT TO:<b@test.ex>
 250 acceptable rcpt cmd

-BDAT 329 LAST
-Unxpected EOF read from client
+BDAT 331 LAST
+Unexpected EOF read from client

 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings


@@ -38,7 +38,7 @@ MAIL FROM:<>
 250 OK
 RCPT TO:<c@test.ex>
 250 OK
 250 OK
 RCPT TO:<c@test.ex>
 250 OK

-BDAT 329 LAST
+BDAT 331 LAST

 250 OK
 
 Comparison failed - bailing out
 250 OK
 
 Comparison failed - bailing out


@@ -53,7 +53,7 @@ MAIL FROM:<>
 250 OK
 RCPT TO:<d@test.ex>
 250 OK
 250 OK
 RCPT TO:<d@test.ex>
 250 OK

-BDAT 329 LAST
+BDAT 331 LAST

 500 oops
 QUIT
 225 OK
 500 oops
 QUIT
 225 OK


@@ -68,7 +68,7 @@ MAIL FROM:<>
 250 OK
 RCPT TO:<e@test.ex>
 250 OK
 250 OK
 RCPT TO:<e@test.ex>
 250 OK

-BDAT 329 LAST
+BDAT 331 LAST

 400 not right now
 QUIT
 225 OK
 400 not right now
 QUIT
 225 OK


@@ -78,17 +78,12 @@ Connection request from [127.0.0.1]
 220 Greetings
 EHLO testhost.test.ex
 250-Hello there
 220 Greetings
 EHLO testhost.test.ex
 250-Hello there

-250-PIPELINING

 250 CHUNKING
 MAIL FROM:<>
 250 CHUNKING
 MAIL FROM:<>

-RCPT TO:<p@test.ex>
-BDAT 329 LAST
-250 OK mail
-250 OK rcpt
-250 OK bdat
+250 OK
+RCPT TO:<ebad@test.ex>
+550 sorry, no

 QUIT
 QUIT

-225 OK
-Expected EOF read from client

 End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]


@@ -98,9 +93,15 @@ EHLO testhost.test.ex
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>

-RCPT TO:<q@test.ex>
-BDAT 329 LAST
-Unxpected EOF read from client
+RCPT TO:<p@test.ex>
+BDAT 331 LAST
+250 OK mail
+250 OK rcpt
+250 OK bdat
+QUIT
+225 OK
+Expected EOF read from client
+End of script

 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings


@@ -110,7 +111,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<r@test.ex>
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<r@test.ex>

-BDAT 329 LAST
+BDAT 331 LAST

 250 OK mail
 250 OK rcpt
 250 OK bdat
 250 OK mail
 250 OK rcpt
 250 OK bdat


@@ -126,7 +127,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<s@test.ex>
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<s@test.ex>

-BDAT 329 LAST
+BDAT 331 LAST

 550 unacceptable mail-from
 550 rcpt ungood lacking mail-from
 500 bdat ungood lacking mail-from
 550 unacceptable mail-from
 550 rcpt ungood lacking mail-from
 500 bdat ungood lacking mail-from


@@ -142,7 +143,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<s1@test.ex>
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<s1@test.ex>

-BDAT 330 LAST
+BDAT 332 LAST

 450 greylisted mail-from
 550 rcpt ungood lacking mail-from
 500 bdat ungood lacking mail-from
 450 greylisted mail-from
 550 rcpt ungood lacking mail-from
 500 bdat ungood lacking mail-from


@@ -158,7 +159,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<t@test.ex>
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<t@test.ex>

-BDAT 329 LAST
+BDAT 331 LAST

 250 OK mail
 550 no such recipient
 500 oops bdat
 250 OK mail
 550 no such recipient
 500 oops bdat


@@ -174,7 +175,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<u@test.ex>
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<u@test.ex>

-BDAT 329 LAST
+BDAT 331 LAST

 250 OK mail
 250 OK rcpt
 500 oops bdat
 250 OK mail
 250 OK rcpt
 500 oops bdat


@@ -190,7 +191,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<v@test.ex>
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<v@test.ex>

-BDAT 329 LAST
+BDAT 331 LAST

 250 OK mail
 250 OK rcpt
 400 not right now bdat
 250 OK mail
 250 OK rcpt
 400 not right now bdat