Check for missing commandline arg after options taking one. Bug 3049

[exim.git] / test / stdout / 0900

diff --git a/test/stdout/0900 b/test/stdout/0900
index 24c591617e77847f2f5d5f762d7f43d72a0146c8..9fe0eb7dea2ca65b039a58ed6925205baaec40e2 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
@@ -28,17 +28,17 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250- 88 byte chunk, total 88
 ??? 250
-<<< 250 OK id=10HmaX-0005vi-00
+<<< 250 OK id=10HmaX-000000005vi-0000
 >>> 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-
@@ -47,12 +47,12 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-CHUNKING
-??? 250 
+??? 250
 <<< 250 HELP
 >>> 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
@@ -70,11 +70,11 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250- 0 byte chunk, total 100
 ??? 250
-<<< 250 OK id=10HmaY-0005vi-00
+<<< 250 OK id=10HmaY-000000005vi-0000
 >>> 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
@@ -88,17 +88,17 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250- 78 byte chunk, total 88
 ??? 250
-<<< 250 OK id=10HmaZ-0005vi-00
+<<< 250 OK id=10HmaZ-000000005vi-0000
 >>> 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-
@@ -107,12 +107,75 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-CHUNKING
-??? 250 
+??? 250
 <<< 250 HELP
+>>> mail from:some_ne@some.domain
+??? 250
+<<< 250 OK
+>>> rcpt to:CALLER@test.ex
+??? 250
+<<< 250 Accepted
+>>> bdat 100
+>>> To: Susan@random.com
+>>> From: Sam@random.com
+>>> Subject: This is a bodyfull test message
+>>> 
+>>> 1234567890
+??? 250
+<<< 250 100 byte chunk received
+>>> noop
+??? 250
+<<< 250 OK
+>>> bdat 0 last
+??? 250-
+<<< 250- 0 byte chunk, total 100
+??? 250
+<<< 250 OK id=10HmbA-000000005vi-0000
+>>> RSET
+??? 250
+<<< 250 Reset OK
 >>> 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
+>>> To: Susan@bdat 78 last
+??? 250
+<<< 250 10 byte chunk received
+>>> random.com
+>>> From: Sam@random.com
+>>> Subject: This is a bodyless test message
+>>> 
+??? 250-
+<<< 250- 78 byte chunk, total 88
+??? 250
+<<< 250 OK id=10HmbB-000000005vi-0000
+>>> 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-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-CHUNKING
+??? 250
+<<< 250 HELP
+>>> mail from:someone@some.domain
+??? 250
+<<< 250 OK
+>>> rcpt to:CALLER@test.ex
 ??? 250
 <<< 250 Accepted
 >>> bdat 89 last
@@ -121,14 +184,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-
@@ -137,12 +200,12 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-CHUNKING
-??? 250 
+??? 250
 <<< 250 HELP
 >>> 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 +220,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-
@@ -173,12 +236,12 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-CHUNKING
-??? 250 
+??? 250
 <<< 250 HELP
 >>> 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 +259,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-
@@ -205,12 +268,12 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-CHUNKING
-??? 250 
+??? 250
 <<< 250 HELP
 >>> 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 +291,240 @@ 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=10HmbF-000000005vi-0000
+>>> 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
+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:<some3ne@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 relay not permitted
+<<< 550 relay not permitted
+??? 503-All RCPT commands were rejected
+<<< 503-All RCPT commands were rejected with this error:
+??? 503-
+<<< 503-relay not permitted
+??? 503
+<<< 503 Valid RCPT command must precede BDAT
+??? 503-All RCPT commands were rejected
+<<< 503-All RCPT commands were rejected with this error:
+??? 503-
+<<< 503-relay not permitted
+??? 503
+<<< 503 valid RCPT command must precede BDAT
+>>> RSET
+??? 250
+<<< 250 Reset OK
+>>> NOOP
+??? 250
+<<< 250 OK
+>>> MAIL FROM:<some4ne@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-All RCPT commands were rejected
+<<< 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
+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:<some5ne@some.domain>\r\nRCPT TO:<CALLER@test.ex>\r\nBDAT 86\r\nTo: Susan@random.com\r\nFrom: Sa5@random.com\r\nSubject: This is a bodyless test message\r\nRSET
+??? 250 OK
+<<< 250 OK
+??? 250 Accepted
+<<< 250 Accepted
+??? 250 86 byte chunk received
+<<< 250 86 byte chunk received
+??? 250 Reset OK
+<<< 250 Reset OK
+>>> MAIL FROM:<some6ne@some.domain>\r\nRCPT TO:<CALLER@test.ex>\r\nBDAT 86\r\nTo: Susan@random.com\r\nFrom: Sa6@random.com\r\nSubject: This is a bodyless test message\r\nBDAT 6 LAST\r\nZZ\r\n
+??? 250 OK
+<<< 250 OK
+??? 250 Accepted
+<<< 250 Accepted
+??? 250 86 byte chunk received
+<<< 250 86 byte chunk received
+??? 250- 6 byte chunk, total 93
+<<< 250- 6 byte chunk, total 93
+??? 250 OK
+<<< 250 OK id=10HmbG-000000005vi-0000
+>>> 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
+??? 250
+<<< 250 OK
+>>> rcpt to:CALLER@test.ex
+??? 250
+<<< 250 Accepted
+>>> bdat 87 last
+>>> To: Susan@random.com\n
+>>> From: Sam@random.com
+>>> Subject: This is a Bodyless test message
+>>> 
+??? 552
+<<< 552 Message header not CRLF terminated
+>>> 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
+??? 250
+<<< 250 OK
+>>> rcpt to:CALLER@test.ex
+??? 250
+<<< 250 Accepted
+>>> bdat 98 last
+>>> To: Susan@random.com
+>>> From: Sam@random.com
+>>> Subject: This is a bodyfull test message
+>>> 
+>>> 1234567890
+??? 250-
+<<< 250- 98 byte chunk, total 100
+??? 250
+<<< 250 OK id=10HmbH-000000005vi-0000
+>>> quit
+??? 221
+<<< 221 testhost.test.ex closing connection
 End of script