Merge branch 'master' into 4.next

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

diff --git a/test/scripts/0000-Basic/0023 b/test/scripts/0000-Basic/0023
index 28c6ec97a8977b05ffa07d79cee0399740d4baba..40a5bd90940340cea5558858fe3901450f6cb3a5 100644 (file)
--- a/test/scripts/0000-Basic/0023
+++ b/test/scripts/0000-Basic/0023
@@ -1,4 +1,6 @@
 # ACL basic tests
 # ACL basic tests

+need_ipv4
+#

 exim -bh 1.2.3.4
 mail from:<x@y>
 rcpt to:<postmaster@test.ex>
 exim -bh 1.2.3.4
 mail from:<x@y>
 rcpt to:<postmaster@test.ex>


@@ -189,6 +191,17 @@ mail from:<>
 rcpt to:<x@y>
 quit
 ****
 rcpt to:<x@y>
 quit
 ****

+# This resolves to a name which will give `try again' when looked up
+exim -bh V4NET.99.99.96
+mail from:<>
+rcpt to:<x@y>
+quit
+****
+exim -bh V4NET.99.99.96
+mail from:<>
+rcpt to:<defer_ok@y>
+quit
+****

 exim -bh 29.29.29.29
 mail from:<a@localhost>
 rcpt to:<x@y>
 exim -bh 29.29.29.29
 mail from:<a@localhost>
 rcpt to:<x@y>


@@ -299,6 +312,11 @@ data
 .
 mail from:<userx@test.ex>
 rcpt to:<cond-rhubarb@test.ex>
 .
 mail from:<userx@test.ex>
 rcpt to:<cond-rhubarb@test.ex>

+rset
+mail from:<userx@test.ex>
+rcpt to:<cond--1@test.ex>
+data
+.

 quit
 ****
 exim -DLOG_SELECTOR=log_selector=-acl_warn_skipped -odi -bs -oMa 56.56.56.56
 quit
 ****
 exim -DLOG_SELECTOR=log_selector=-acl_warn_skipped -odi -bs -oMa 56.56.56.56