Use dsn_from for success-DSN messages. Bug 2404

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

diff --git a/test/scripts/4600-SPF/4600 b/test/scripts/4600-SPF/4600
index 825efb9595490bd79a1108edf440bd126635e432..d24fa9d94a5d7554e20de0d5dbc81180abca959e 100644 (file)
--- a/test/scripts/4600-SPF/4600
+++ b/test/scripts/4600-SPF/4600
@@ -5,31 +5,31 @@
 # to provide values for testcases.
 #
 # For now just check that what should be working syntax does not cause us to fall over.
 # to provide values for testcases.
 #
 # 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.
+# Be careful with envelope-domains and IPs 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
 mail from:<a@example.com>
 ??? 250
 rcpt to:<fred@test.ex>
 ??? 220
 helo testclient
 ??? 250
 mail from:<a@example.com>
 ??? 250
 rcpt to:<fred@test.ex>

-??? 550
+??? 250

 quit
 ****
 quit
 ****

-client HOSTIPV4 PORT_D
+client 127.0.0.1 PORT_D

 ??? 220
 helo testclient
 ??? 250
 mail from:<b@test.example.com>
 ??? 250
 rcpt to:<fred@test.ex>
 ??? 220
 helo testclient
 ??? 250
 mail from:<b@test.example.com>
 ??? 250
 rcpt to:<fred@test.ex>

-??? 550
+??? 250

 quit
 ****
 quit
 ****

-client 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_S

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