Testsuite: Avoid requesting TLS cert-status requests from GnuTLS test utility unless...

[users/jgh/exim.git] / test / stdout / 0547

diff --git a/test/stdout/0547 b/test/stdout/0547
index 94356f825586303994539155c84df2f6ccdea5d9..7e931992ca51aacded06b0700207a90a7b777622 100644 (file)
--- a/test/stdout/0547
+++ b/test/stdout/0547
@@ -18,6 +18,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250
 <<< 250-SIZE 52428800
 ??? 250
 ??? 250
 <<< 250-SIZE 52428800
 ??? 250

+<<< 250-8BITMIME
+??? 250

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


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

+<<< 250-8BITMIME
+??? 250

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


@@ -57,31 +61,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 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 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 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 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 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 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 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 +100,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 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 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 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