Fix IP SRR parsing. Bug 3124

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

diff --git a/test/scripts/4600-SPF/4600 b/test/scripts/4600-SPF/4600
index 8490288e19dd3a186c2a41c78b2e07de5ebaaa0c..55e2e0aff696beb8c673f170662387864230fa84 100644 (file)
--- a/test/scripts/4600-SPF/4600
+++ b/test/scripts/4600-SPF/4600
@@ -7,7 +7,7 @@
 # so the testsuite intercept to fakedns works.  Be careful of names and addresses
 # used, as nonhandled lookups are passed on to real DNS.
 #
 # 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_N
+exim -bd -DSERVER=server -oX PORT_D:PORT_S:PORT_D2

 ****
 client 127.0.0.1 PORT_S
 ??? 220
 ****
 client 127.0.0.1 PORT_S
 ??? 220


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

-client 127.0.0.1 PORT_N
+client 127.0.0.1 PORT_D2

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


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