tidying

[exim.git] / test / scripts / 0000-Basic / 0023

diff --git a/test/scripts/0000-Basic/0023 b/test/scripts/0000-Basic/0023
index 51e7123d0d3cc535dcdf8d3622b36efbcf711ec7..109037f69ce1ce3c0aa946c8b1fcdec60b33f9af 100644 (file)
--- a/test/scripts/0000-Basic/0023
+++ b/test/scripts/0000-Basic/0023
@@ -1,5 +1,8 @@
 # ACL basic tests
+need_ipv4
+#
 exim -bh 1.2.3.4
+helo test
 mail from:<x@y>
 rcpt to:<postmaster@test.ex>
 rcpt to:<z@z>
@@ -13,6 +16,7 @@ rcpt to:<x@wontpass>
 quit
 ****
 exim -bh 5.6.7.8
+helo test
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<x@test.ex>
@@ -21,24 +25,28 @@ rcpt to:<spqr@test.ex>
 quit
 ****
 exim -bh 9.9.9.9
+helo test
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<a@b>
 quit
 ****
 exim -bh 9.9.9.8
+helo test
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<a@b>
 quit
 ****
 exim -bh 9.9.9.255
+helo test
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<a@b>
 quit
 ****
 exim -bh 5.6.8.1
+helo test
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<y@x>
@@ -59,6 +67,7 @@ rset
 quit
 ****
 exim -bh 5.6.11.1
+helo test
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<x2@y>
@@ -66,23 +75,27 @@ rcpt to:<y2@y>
 quit
 ****
 exim -bh 5.6.12.1
+helo test
 mail from:<x@y>
 rcpt to:<x@ok>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 5.6.12.2
+helo test
 mail from:<x@y>
 rcpt to:<x@ok>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 8.8.8.8
+helo test
 mail from:<x@y>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 5.6.13.1
+helo test
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<x1@y>
@@ -90,30 +103,35 @@ rcpt to:<x2@y>
 quit
 ****
 exim -bh V4NET.11.12.13
+helo test
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<x1@y>
 quit
 ****
 exim -bh V4NET.11.12.12
+helo test
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<x1@y>
 quit
 ****
 exim -bh 20.20.20.20
+helo test
 mail from:<x@y>
 rcpt to:<x1@y>
 rcpt to:<x2@y>
 quit
 ****
 exim -bh 20.20.20.20
+helo test
 mail from:<userx@y>
 rcpt to:<x1@y>
 rcpt to:<userx@y>
 quit
 ****
 exim -bh 21.21.21.21
+helo test
 mail from:<userx@y>
 rcpt to:<x1@y>
 rcpt to:<userx@y>
@@ -128,12 +146,14 @@ rcpt to:<x@y>
 quit
 ****
 exim -bh 22.22.22.22
+helo test
 mail from:<userx@y>
 rcpt to:<userx@y>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 23.23.23.0
+helo test
 mail from:<x@y>
 rcpt to:<userx@y>
 rset
@@ -142,21 +162,25 @@ rcpt to:<userx@y>
 quit
 ****
 exim -bh 23.23.23.1
+helo test
 mail from:<x@y>
 rcpt to:<userx@y>
 quit
 ****
 exim -bh 24.24.24.24
+helo test
 mail from:<x@y>
 rcpt to:<userx@y>
 quit
 ****
 exim -bh 25.25.25.25
+helo test
 mail from:<x@y>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 26.26.26.26
+helo test
 mail from:<>
 rcpt to:<x@y>
 rcpt to:<y@y>
@@ -164,11 +188,13 @@ rcpt to:<z@y>
 quit
 ****
 exim -bh 27.27.27.27
+helo test
 mail from:<>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 28.28.28.28
+helo test
 mail from:<>
 rcpt to:<x@y>
 rset
@@ -180,16 +206,32 @@ rcpt to:<x@y>
 quit
 ****
 exim -bh V4NET.0.0.3
+helo test
 mail from:<>
 rcpt to:<x@y>
 quit
 ****
 exim -bh V4NET.0.0.97
+helo test
 mail from:<>
 rcpt to:<x@y>
 quit
 ****
+# This resolves to a name which will give `try again' when looked up
+exim -bh V4NET.99.99.96
+helo test
+mail from:<>
+rcpt to:<x@y>
+quit
+****
+exim -bh V4NET.99.99.96
+helo test
+mail from:<>
+rcpt to:<defer_ok@y>
+quit
+****
 exim -bh 29.29.29.29
+helo test
 mail from:<a@localhost>
 rcpt to:<x@y>
 rset
@@ -198,6 +240,7 @@ rcpt to:<x@y>
 quit
 ****
 exim -bh 30.30.30.30
+helo test
 mail from:<a@ten-1>
 rcpt to:<x@y>
 rset
@@ -209,11 +252,13 @@ rcpt to:<x@y>
 quit
 ****
 exim -bh 31.31.31.31
+helo test
 mail from:<x@y>
 rcpt to:<x@y>
 quit
 ****
 exim -odi -bs -oMa 32.32.32.32
+helo test
 mail from:<userx@test.ex>
 rcpt to:<userx-vs@test.ex>
 data
@@ -222,6 +267,7 @@ Test with verify sender.
 quit
 ****
 exim -odi -bs -oMa 32.32.32.32
+helo test
 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data
@@ -230,6 +276,7 @@ Test without verify sender.
 quit
 ****
 exim -bh 33.33.33.33
+helo test
 mail from:<x@y>
 rcpt to:<x1@y>
 rcpt to:<x2@y>
@@ -237,11 +284,13 @@ quit
 ****
 # The 1 causes a 1-second delay in the test.again.dns lookup
 exim -bh 44.44.44.1
+helo test
 mail from:<x@y>
 rcpt to:<x@y>
 quit
 ****
 exim -odi -bs -oMa 55.55.55.55
+helo test
 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data
@@ -250,6 +299,7 @@ ACL header adding test.
 quit
 ****
 exim -odi -bs -oMa 56.56.56.56
+helo test
 mail from:<userx@test.ex>
 rcpt to:<cond-yes@test.ex>
 data
@@ -293,6 +343,7 @@ data
 quit
 ****
 exim -odi -bs -oMa 56.56.57.57
+helo test
 mail from:<userx@test.ex>
 rcpt to:<cond-yes@test.ex>
 data
@@ -307,6 +358,7 @@ data
 quit
 ****
 exim -DLOG_SELECTOR=log_selector=-acl_warn_skipped -odi -bs -oMa 56.56.56.56
+helo test
 mail from:<userx@test.ex>
 rcpt to:<cond-rhubarb@test.ex>
 data
@@ -314,6 +366,7 @@ data
 quit
 ****
 exim -odi -bs -oMa 56.56.58.58
+helo test
 mail from:<rcpttest@test.ex>
 rcpt to:<ok1@test.ex>
 rcpt to:<bad1@test.ex>
@@ -326,17 +379,20 @@ data
 quit
 ****
 exim -odi -bs -oMa 56.56.59.59
+helo test
 mail from:<rcpttest@test.ex>
 rcpt to:<fail@test.ex>
 quit
 ****
 exim -odi -bs -oMa V4NET.11.12.13
+helo test
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<x1@y>
 quit
 ****
 exim -bh 60.60.60.60
+helo test
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<a@b>