Attempt egrep compat for Solaris vs. Linux

[exim.git] / test / stdout / 0547

diff --git a/test/stdout/0547 b/test/stdout/0547
index 94356f825586303994539155c84df2f6ccdea5d9..84c691121db7e349309964082c56883355b096d5 100644 (file)
--- a/test/stdout/0547
+++ b/test/stdout/0547
@@ -17,6 +17,10 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250-myhost.test.ex Hello x.y.z [127.0.0.1]
 ??? 250
 <<< 250-SIZE 52428800
 <<< 250-myhost.test.ex Hello x.y.z [127.0.0.1]
 ??? 250
 <<< 250-SIZE 52428800

+??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250
+<<< 250-8BITMIME

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


@@ -37,6 +41,10 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250
 <<< 250-SIZE 52428800
 ??? 250
 ??? 250
 <<< 250-SIZE 52428800
 ??? 250

+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
+<<< 250-8BITMIME
+??? 250

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


@@ -57,31 +65,31 @@ End of script
 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r
 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r

-214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP\r
+214 AUTH HELO EHLO MAIL RCPT DATA BDAT NOOP QUIT RSET HELP\r

 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r
 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r

-214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP\r
+214 AUTH HELO EHLO MAIL RCPT DATA BDAT NOOP QUIT RSET HELP\r

 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r
 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r

-214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP\r
+214 AUTH HELO EHLO MAIL RCPT DATA BDAT NOOP QUIT RSET HELP\r

 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r
 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r

-214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP\r
+214 AUTH HELO EHLO MAIL RCPT DATA BDAT NOOP QUIT RSET HELP\r

 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r
 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r

-214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP\r
+214 AUTH HELO EHLO MAIL RCPT DATA BDAT NOOP QUIT RSET HELP\r

 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r
 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r

-214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP\r
+214 AUTH HELO EHLO MAIL RCPT DATA BDAT NOOP QUIT RSET HELP\r

 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r
 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r

-214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP\r
+214 AUTH HELO EHLO MAIL RCPT DATA BDAT NOOP QUIT RSET HELP\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
 550 Administrative prohibition\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
 550 Administrative prohibition\r


@@ -96,15 +104,15 @@ End of script
 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r
 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r

-214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP\r
+214 AUTH HELO EHLO MAIL RCPT DATA BDAT NOOP QUIT RSET HELP\r

 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r
 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r

-214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP\r
+214 AUTH HELO EHLO MAIL RCPT DATA BDAT NOOP QUIT RSET HELP\r

 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r
 250 Reset OK\r
 250 OK\r
 214-Commands supported:\r

-214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP\r
+214 AUTH HELO EHLO MAIL RCPT DATA BDAT NOOP QUIT RSET HELP\r

 250 Reset OK\r
 250 OK\r
 554 Too many nonmail commands\r
 250 Reset OK\r
 250 OK\r
 554 Too many nonmail commands\r