more detail in error messages

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

diff --git a/test/scripts/4600-SPF/4600 b/test/scripts/4600-SPF/4600
index 58239487978e6957243e62ce3959d96f1bc45fa7..55e2e0aff696beb8c673f170662387864230fa84 100644 (file)
--- a/test/scripts/4600-SPF/4600
+++ b/test/scripts/4600-SPF/4600
@@ -3,7 +3,11 @@
 # The 127.0.0.1 source addr seems to be a builtin in the spf library; no dns lookup is done.
 # HOSTIPV4 does get a series of lookups (see server debug output to verify that).
 #
-exim -bd -DSERVER=server -oX PORT_D:PORT_S:PORT_N
+# The libspf2 object stack is built with an exim-specific DNS lookup base object,
+# so the testsuite intercept to fakedns works.  Be careful of names and addresses
+# used, as nonhandled lookups are passed on to real DNS.
+#
+exim -bd -DSERVER=server -oX PORT_D:PORT_S:PORT_D2
 ****
 client 127.0.0.1 PORT_S
 ??? 220
@@ -45,7 +49,7 @@ rcpt to:<fred@test.ex>
 ??? 550
 quit
 ****
-client 127.0.0.1 PORT_N
+client 127.0.0.1 PORT_D2
 ??? 220
 helo testclient
 ??? 250
@@ -56,4 +60,32 @@ rcpt to:<fred@test.ex>
 quit
 ****
 #
+#
+#
+#
+#
+# helo name gets used when mailfrom is null
+client HOSTIPV4 PORT_S
+??? 220
+helo passme.helo.example.com
+??? 250
+mail from:<>
+??? 250
+rcpt to:<fred@test.ex>
+??? 250
+quit
+****
+#
+# helo name is overridden when a mailfrom is set
+client HOSTIPV4 PORT_S
+??? 220
+helo passme.helo.example.com
+??? 250
+mail from:<failme@example.com>
+??? 250
+rcpt to:<fred@test.ex>
+??? 550
+quit
+****
+#
 killdaemon