X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/4f6bbb37e87d83d62840a53763d1273f9737a601..68d0c019bace3e1d956ea54d4c5276b8c45b6c1d:/test/scripts/4600-SPF/4600?ds=inline diff --git a/test/scripts/4600-SPF/4600 b/test/scripts/4600-SPF/4600 index 8490288e1..55e2e0aff 100644 --- 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. # -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 @@ -49,7 +49,7 @@ rcpt to: ??? 550 quit **** -client 127.0.0.1 PORT_N +client 127.0.0.1 PORT_D2 ??? 220 helo testclient ??? 250 @@ -60,4 +60,32 @@ rcpt to: 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: +??? 250 +quit +**** +# +# helo name is overridden when a mailfrom is set +client HOSTIPV4 PORT_S +??? 220 +helo passme.helo.example.com +??? 250 +mail from: +??? 250 +rcpt to: +??? 550 +quit +**** +# killdaemon