Transports: pass back next id for continued-transport

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

diff --git a/test/scripts/4600-SPF/4600 b/test/scripts/4600-SPF/4600
index cb67d19ae21d1bc2e56bb4d8fea526f25c063189..55e2e0aff696beb8c673f170662387864230fa84 100644 (file)
--- a/test/scripts/4600-SPF/4600
+++ b/test/scripts/4600-SPF/4600
@@ -60,9 +60,14 @@ rcpt to:<fred@test.ex>
 quit
 ****
 #
 quit
 ****
 #

-client 127.0.0.1 PORT_S
+#
+#
+#
+#
+# helo name gets used when mailfrom is null
+client HOSTIPV4 PORT_S

 ??? 220
 ??? 220

-helo example.com
+helo passme.helo.example.com

 ??? 250
 mail from:<>
 ??? 250
 ??? 250
 mail from:<>
 ??? 250


@@ -71,4 +76,16 @@ rcpt to:<fred@test.ex>
 quit
 ****
 #
 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
 killdaemon