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

[exim.git] / test / stdout / 3400

diff --git a/test/stdout/3400 b/test/stdout/3400
index 67add4d54e26b7688910e064f97e0b761af0c90f..9ed13f1734e6a9ed08c5b9b75396fb0c83f9ad2c 100644 (file)
--- a/test/stdout/3400
+++ b/test/stdout/3400
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** 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 test [10.0.0.2]\r

 250 OK\r
 250 Reset OK\r
 250 <userx@test.ex> is deliverable\r
 250 OK\r
 250 Reset OK\r
 250 <userx@test.ex> is deliverable\r


@@ -20,6 +21,7 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r


@@ -53,6 +55,7 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r


@@ -69,6 +72,7 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r


@@ -76,32 +80,33 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\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
+250 OK id=10HmaX-000000005vi-0000\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmaY-0005vi-00\r
+250 OK id=10HmaY-000000005vi-0000\r

 235 Authentication succeeded\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 235 Authentication succeeded\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmaZ-0005vi-00\r
+250 OK id=10HmaZ-000000005vi-0000\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmbA-0005vi-00\r
+250 OK id=10HmbA-000000005vi-0000\r

 501 invalid data for AUTH\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 501 invalid data for AUTH\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmbB-0005vi-00\r
+250 OK id=10HmbB-000000005vi-0000\r

 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r


@@ -113,6 +118,7 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r


@@ -124,6 +130,7 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r


@@ -136,6 +143,7 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r


@@ -146,13 +154,14 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmbC-0005vi-00\r
+250 OK id=10HmbC-000000005vi-0000\r

 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r


@@ -165,6 +174,7 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r


@@ -176,6 +186,7 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r


@@ -188,6 +199,7 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r


@@ -206,6 +218,7 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250 HELP\r
 250-EXPN\r
 250-PIPELINING\r
 250 HELP\r


@@ -215,6 +228,7 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r


@@ -226,6 +240,7 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r


@@ -238,6 +253,7 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r


@@ -250,6 +266,7 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r


@@ -262,6 +279,7 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250 HELP\r
 250-EXPN\r
 250-PIPELINING\r
 250 HELP\r


@@ -273,6 +291,7 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r


@@ -304,6 +323,7 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r


@@ -311,23 +331,24 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmbD-0005vi-00\r
+250 OK id=10HmbD-000000005vi-0000\r

 235 Authentication succeeded\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 235 Authentication succeeded\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmbE-0005vi-00\r
+250 OK id=10HmbE-000000005vi-0000\r

 503 already authenticated\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 503 already authenticated\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmbF-0005vi-00\r
+250 OK id=10HmbF-000000005vi-0000\r

 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r


@@ -341,6 +362,7 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r


@@ -352,6 +374,7 @@
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250 HELP\r
 250-EXPN\r
 250-PIPELINING\r
 250 HELP\r