Merge branch 'master' into 4.next

[exim.git] / test / scripts / 0000-Basic / 0230

diff --git a/test/scripts/0000-Basic/0230 b/test/scripts/0000-Basic/0230
index 8a64308aff86fc22b296724df9a90cc061176f24..11df58621b76bd5f1bca0a8508b334104e990c76 100644 (file)
--- a/test/scripts/0000-Basic/0230
+++ b/test/scripts/0000-Basic/0230
@@ -5,6 +5,8 @@ exim -DSERVER=server -bd -oX PORT_D
 ****
 client HOSTIPV4 PORT_D
 ??? 220
 ****
 client HOSTIPV4 PORT_D
 ??? 220

+helo test
+??? 250

 mail from:<x@y.x>
 ??? 250
 rcpt to:<x@test.ex>
 mail from:<x@y.x>
 ??? 250
 rcpt to:<x@test.ex>


@@ -17,8 +19,10 @@ quit
 ??? 221
 +++ 1
 ****
 ??? 221
 +++ 1
 ****

-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D

 ??? 220
 ??? 220

+helo test
+??? 250

 mail from:<x@y.x>
 ??? 250
 rcpt to:<x@test.ex>
 mail from:<x@y.x>
 ??? 250
 rcpt to:<x@test.ex>


@@ -48,6 +52,7 @@ quit
 ****
 killdaemon
 sudo exim -bs -oMa V4NET.9.8.7.1234
 ****
 killdaemon
 sudo exim -bs -oMa V4NET.9.8.7.1234

+helo test

 mail from:<x@y.x>
 rcpt to:<x@test.ex>
 data
 mail from:<x@y.x>
 rcpt to:<x@test.ex>
 data


@@ -60,3 +65,24 @@ exim -odi -qf
 exim -bh 192.168.1.2.99
 quit
 ****
 exim -bh 192.168.1.2.99
 quit
 ****

+#
+#
+#
+#
+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+sudo exim -DOPT -bs -oMa V4NET.9.8.7.1225
+helo test
+mail from:<x@y.x>
+rcpt to:<x@test.ex>
+data
+this is a message
+.
+quit
+****
+exim -DOPT -odi -qf
+****
+#
+#
+killdaemon