Use dsn_from for success-DSN messages. Bug 2404

[exim.git] / test / scripts / 4600-SPF / 4601

diff --git a/test/scripts/4600-SPF/4601 b/test/scripts/4600-SPF/4601
index 096b64e2424c61375edb8c17832557810a9ef94b..ab434611c962e52de987495434baf1dea9c440ec 100644 (file)
--- a/test/scripts/4600-SPF/4601
+++ b/test/scripts/4600-SPF/4601
@@ -7,9 +7,9 @@
 # For now just check that what should be working syntax does not cause us to fall over.
 # Be careful with envelope-domains used for testcases, as real DNS lookups will be done.
 #
 # For now just check that what should be working syntax does not cause us to fall over.
 # Be careful with envelope-domains used for testcases, as real DNS lookups will be done.
 #

-exim -bd -DSERVER=server -oX PORT_D
+exim -bd -DSERVER=server -oX PORT_D:PORT_S

 ****
 ****

-client HOSTIPV4 PORT_D
+client 127.0.0.1 PORT_D

 ??? 220
 helo testclient
 ??? 250
 ??? 220
 helo testclient
 ??? 250


@@ -19,7 +19,7 @@ rcpt to:<fred@test.ex>
 ??? 250
 quit
 ****
 ??? 250
 quit
 ****

-client 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_S

 ??? 220
 helo testclient
 ??? 250
 ??? 220
 helo testclient
 ??? 250