Use dsn_from for success-DSN messages. Bug 2404

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

diff --git a/test/scripts/0000-Basic/0562 b/test/scripts/0000-Basic/0562
index 2fcaf354de4cfc1162c7b98e5a932e7146608328..b829dff30a0184c9e52fdae4610cf01193f396b4 100644 (file)
--- a/test/scripts/0000-Basic/0562
+++ b/test/scripts/0000-Basic/0562
@@ -3,7 +3,7 @@ need_ipv4
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****

-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D

 ??? 220
 ehlo abcd
 ??? 250-
 ??? 220
 ehlo abcd
 ??? 250-


@@ -18,14 +18,14 @@ mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
 This is a test message.
 +++ 2
 ****
 This is a test message.
 +++ 2
 ****

-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D

 ??? 220
 +++ 2
 ****
 ??? 220
 +++ 2
 ****

-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D

 ??? 220
 ****
 ??? 220
 ****

-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D

 ??? 220
 unknown
 ??? 500
 ??? 220
 unknown
 ??? 500


@@ -36,20 +36,20 @@ unknown
 unknown
 ??? 500
 ****
 unknown
 ??? 500
 ****

-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D

 ??? 220
 vrfy
 ??? 220
 vrfy

+??? 501
+vrfy foo@bar

 ??? 252
 vrfy
 ??? 252
 vrfy

-??? 252
-vrfy
-??? 252
+??? 501

 vrfy
 vrfy

-??? 252
+??? 501

 vrfy
 ??? 554
 ****
 vrfy
 ??? 554
 ****

-client 127.0.0.1 PORT_D 127.0.0.1
+client 127.0.0.1 PORT_D

 ??? 220
 ehlo abcd
 ??? 250-
 ??? 220
 ehlo abcd
 ??? 250-