From b43a74eae436554933b0d50b5757a42c048fc1d3 Mon Sep 17 00:00:00 2001 From: Philip Hazel Date: Mon, 16 Apr 2007 11:17:12 +0000 Subject: Do not advertise STARTTLS in response to HELP unless it would be advertised in response to EHLO. --- test/stdout/0547 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'test/stdout/0547') diff --git a/test/stdout/0547 b/test/stdout/0547 index 94356f825..ca7e42990 100644 --- a/test/stdout/0547 +++ b/test/stdout/0547 @@ -57,31 +57,31 @@ End of script 250 Reset OK 250 OK 214-Commands supported: -214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP +214 AUTH HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP 250 Reset OK 250 OK 214-Commands supported: -214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP +214 AUTH HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP 250 Reset OK 250 OK 214-Commands supported: -214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP +214 AUTH HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP 250 Reset OK 250 OK 214-Commands supported: -214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP +214 AUTH HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP 250 Reset OK 250 OK 214-Commands supported: -214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP +214 AUTH HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP 250 Reset OK 250 OK 214-Commands supported: -214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP +214 AUTH HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP 250 Reset OK 250 OK 214-Commands supported: -214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP +214 AUTH HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP 221 myhost.test.ex closing connection 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 550 Administrative prohibition @@ -96,15 +96,15 @@ End of script 250 Reset OK 250 OK 214-Commands supported: -214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP +214 AUTH HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP 250 Reset OK 250 OK 214-Commands supported: -214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP +214 AUTH HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP 250 Reset OK 250 OK 214-Commands supported: -214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP +214 AUTH HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP 250 Reset OK 250 OK 554 Too many nonmail commands -- cgit v1.2.3