Cutthrough: option to use transport-defined mailfrom. Bug 3071

[exim.git] / test / scripts / 2000-GnuTLS / 2036

diff --git a/test/scripts/2000-GnuTLS/2036 b/test/scripts/2000-GnuTLS/2036
index 76a55e22717c70b4083c831393274dfa82f6764a..b16b082d72aebc822cd20364aa338719cf348445 100644 (file)
--- a/test/scripts/2000-GnuTLS/2036
+++ b/test/scripts/2000-GnuTLS/2036
@@ -2,6 +2,7 @@
 gnutls
 need_ipv4
 #
 gnutls
 need_ipv4
 #

+# a recipient verify and continued-delivery

 # smtp send
 # a tls-capable target for the verify/delivery connection on PORT_D
 # plus a daemon under test on PORT_S
 # smtp send
 # a tls-capable target for the verify/delivery connection on PORT_D
 # plus a daemon under test on PORT_S


@@ -16,6 +17,7 @@ EHLO test.ex
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250 
 MAIL FROM:<userc@ok.example>
 ??? 250
 ??? 250 
 MAIL FROM:<userc@ok.example>
 ??? 250


@@ -33,6 +35,8 @@ QUIT
 ****
 sleep 3
 killdaemon
 ****
 sleep 3
 killdaemon

+exim -q
+****

 #
 #
 # smtp send, deliver_drop_priv
 #
 #
 # smtp send, deliver_drop_priv


@@ -47,6 +51,7 @@ EHLO test.ex
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250 
 MAIL FROM:<usere@ok.example>
 ??? 250
 ??? 250 
 MAIL FROM:<usere@ok.example>
 ??? 250


@@ -64,6 +69,9 @@ QUIT
 ****
 sleep 3
 killdaemon
 ****
 sleep 3
 killdaemon

+exim -q
+****
+#

 #
 #
 no_stdout_check
 #
 #
 no_stdout_check