Merge branch '4.next'

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

diff --git a/test/scripts/4600-SPF/4600 b/test/scripts/4600-SPF/4600
index 3907f6861466ab09336caba7d6bd5f30f2dc2afb..d24fa9d94a5d7554e20de0d5dbc81180abca959e 100644 (file)
--- a/test/scripts/4600-SPF/4600
+++ b/test/scripts/4600-SPF/4600
@@ -5,25 +5,35 @@
 # 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
 ****
 client 127.0.0.1 PORT_D
 ??? 220
 helo testclient
 ??? 250
 quit
 ****
 client 127.0.0.1 PORT_D
 ??? 220
 helo testclient
 ??? 250

-mail from:<b@example.com>
+mail from:<b@test.example.com>
+??? 250
+rcpt to:<fred@test.ex>
+??? 250
+quit
+****
+client 127.0.0.1 PORT_S
+??? 220
+helo testclient
+??? 250
+mail from:<c@example.com>

 ??? 250
 rcpt to:<fred@test.ex>
 ??? 250
 ??? 250
 rcpt to:<fred@test.ex>
 ??? 250