CHUNKING: after rejecting a pipelined SMTP command, flush any followon BDAT data

[exim.git] / test / stdout / 0900

diff --git a/test/stdout/0900 b/test/stdout/0900
index 24c591617e77847f2f5d5f762d7f43d72a0146c8..70c527c17fd6ee78c41e945301589e7b5f4a6559 100644 (file)
--- a/test/stdout/0900
+++ b/test/stdout/0900
@@ -1,14 +1,14 @@
 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
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ehlo tester
 ??? 250-
-<<< 250-the.local.host.name Hello tester [127.0.0.1]
-??? 250-
+<<< 250-testhost.test.ex Hello tester [127.0.0.1]
+??? 250-SIZE
 <<< 250-SIZE 52428800
-??? 250-
+??? 250-8BITMIME
 <<< 250-8BITMIME
-??? 250-
+??? 250-PIPELINING
 <<< 250-PIPELINING
 ??? 250-CHUNKING
 <<< 250-CHUNKING
@@ -17,7 +17,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> mail from:someone@some.domain
 ??? 250
 <<< 250 OK
->>> rcpt to:CALLER@the.local.host.name
+>>> rcpt to:CALLER@test.ex
 ??? 250
 <<< 250 Accepted
 >>> bdat 88 last
@@ -31,14 +31,14 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250 OK id=10HmaX-0005vi-00
 >>> quit
 ??? 221
-<<< 221 the.local.host.name closing connection
+<<< 221 testhost.test.ex closing connection
 End of script
 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
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ehlo tester
 ??? 250-
-<<< 250-the.local.host.name Hello tester [127.0.0.1]
+<<< 250-testhost.test.ex Hello tester [127.0.0.1]
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
@@ -52,7 +52,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> mail from:someone@some.domain
 ??? 250
 <<< 250 OK
->>> rcpt to:CALLER@the.local.host.name
+>>> rcpt to:CALLER@test.ex
 ??? 250
 <<< 250 Accepted
 >>> bdat 100
@@ -74,7 +74,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> mail from:someone@some.domain
 ??? 250
 <<< 250 OK
->>> rcpt to:CALLER@the.local.host.name
+>>> rcpt to:CALLER@test.ex
 ??? 250
 <<< 250 Accepted
 >>> bdat 10
@@ -91,14 +91,14 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250 OK id=10HmaZ-0005vi-00
 >>> quit
 ??? 221
-<<< 221 the.local.host.name closing connection
+<<< 221 testhost.test.ex closing connection
 End of script
 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
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ehlo tester
 ??? 250-
-<<< 250-the.local.host.name Hello tester [127.0.0.1]
+<<< 250-testhost.test.ex Hello tester [127.0.0.1]
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
@@ -112,7 +112,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> mail from:someone@some.domain
 ??? 250
 <<< 250 OK
->>> rcpt to:CALLER@the.local.host.name
+>>> rcpt to:CALLER@test.ex
 ??? 250
 <<< 250 Accepted
 >>> bdat 89 last
@@ -121,14 +121,14 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> Subject: This is a bodyless test message
 >>> 
 ??? 421
-<<< 421 the.local.host.name SMTP incoming data timeout - closing connection.
+<<< 421 testhost.test.ex SMTP incoming data timeout - closing connection.
 End of script
 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
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ehlo tester
 ??? 250-
-<<< 250-the.local.host.name Hello tester [127.0.0.1]
+<<< 250-testhost.test.ex Hello tester [127.0.0.1]
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
@@ -142,7 +142,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> mail from:someone@some.domain
 ??? 250
 <<< 250 OK
->>> rcpt to:CALLER@the.local.host.name
+>>> rcpt to:CALLER@test.ex
 ??? 250
 <<< 250 Accepted
 >>> bdat 88
@@ -157,14 +157,14 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 504 zero size for BDAT command
 >>> quit
 ??? 221
-<<< 221 the.local.host.name closing connection
+<<< 221 testhost.test.ex closing connection
 End of script
 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
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ehlo tester
 ??? 250-
-<<< 250-the.local.host.name Hello tester [127.0.0.1]
+<<< 250-testhost.test.ex Hello tester [127.0.0.1]
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
@@ -178,7 +178,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> mail from:someone@some.domain
 ??? 250
 <<< 250 OK
->>> rcpt to:CALLER@the.local.host.name
+>>> rcpt to:CALLER@test.ex
 ??? 250
 <<< 250 Accepted
 >>> bdat 88
@@ -196,7 +196,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250 Reset OK
 >>> EHLO tester
 ??? 250-
-<<< 250-the.local.host.name Hello tester [127.0.0.1]
+<<< 250-testhost.test.ex Hello tester [127.0.0.1]
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
@@ -210,7 +210,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> mail from:someone@some.domain
 ??? 250
 <<< 250 OK
->>> rcpt to:CALLER@the.local.host.name
+>>> rcpt to:CALLER@test.ex
 ??? 250
 <<< 250 Accepted
 >>> bdat 88
@@ -228,5 +228,71 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 503 only RSET accepted now
 >>> quit
 ??? 221
-<<< 221 the.local.host.name closing connection
+<<< 221 testhost.test.ex closing connection
+End of script
+Connecting to 127.0.0.1 port 1225 ... connected
+??? 220
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> EHLO tester
+??? 250-
+<<< 250-testhost.test.ex Hello tester [127.0.0.1]
+??? 250-SIZE
+<<< 250-SIZE 52428800
+??? 250-8BITMIME
+<<< 250-8BITMIME
+??? 250-PIPELINING
+<<< 250-PIPELINING
+??? 250-CHUNKING
+<<< 250-CHUNKING
+??? 250 HELP
+<<< 250 HELP
+>>> MAIL FROM:<someone@some.domain>\r\nRCPT TO:<CALLER@test.ex>\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n
+??? 250
+<<< 250 OK
+??? 250
+<<< 250 Accepted
+??? 250-
+<<< 250- 88 byte chunk, total 88
+??? 250
+<<< 250 OK id=10HmbB-0005vi-00
+>>> quit
+??? 221
+<<< 221 testhost.test.ex closing connection
+End of script
+Connecting to 127.0.0.1 port 1225 ... connected
+??? 220
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> EHLO tester
+??? 250-
+<<< 250-testhost.test.ex Hello tester [127.0.0.1]
+??? 250-SIZE
+<<< 250-SIZE 52428800
+??? 250-8BITMIME
+<<< 250-8BITMIME
+??? 250-PIPELINING
+<<< 250-PIPELINING
+??? 250-CHUNKING
+<<< 250-CHUNKING
+??? 250 HELP
+<<< 250 HELP
+>>> MAIL FROM:<someone@some.domain>\r\nRCPT TO:<dummy@reject.ex>\r\nBDAT 86\r\nTo: Susan@random.com\r\nFrom: Sal@random.com\r\nSubject: This is a bodyless test message\r\nBDAT 6 LAST\r\nZZ\r\n
+??? 250
+<<< 250 OK
+??? 550
+<<< 550 relay not permitted
+??? 503-
+<<< 503-All RCPT commands were rejected with this error:
+??? 503-
+<<< 503-relay not permitted
+??? 503
+<<< 503 Valid RCPT command must precede BDAT
+??? 503-
+<<< 503-All RCPT commands were rejected with this error:
+??? 503-
+<<< 503-relay not permitted
+??? 503
+<<< 503 valid RCPT command must precede BDAT
+>>> quit
+??? 221
+<<< 221 testhost.test.ex closing connection
 End of script