Add a test for "!acl=" which was missing (and would have picked up a bug

in 4.61).

diff --git a/test/aux-fixed/0023.acl2 b/test/aux-fixed/0023.acl2
new file mode 100644 (file)
index 0000000..044eada
--- /dev/null
+++ b/test/aux-fixed/0023.acl2
@@ -0,0 +1,2 @@
+accept  domains = b
+        local_parts = a

diff --git a/test/confs/0023 b/test/confs/0023
index 62e444a5d6104ab845d4a817718daadf0bc5d273..be99eb00fa9b5d8841cd34a2be4203ed0904ccef 100644 (file)
--- a/test/confs/0023
+++ b/test/confs/0023
@@ -219,6 +219,9 @@ acl_56_56_59:
                     Original was >$acl_verify_message<
           verify  = recipient
 
+acl_60_60_60:
+  accept !acl = DIR/aux-fixed/0023.acl2
+
 
 # ----- Transports -----
 

diff --git a/test/scripts/0000-Basic/0023 b/test/scripts/0000-Basic/0023
index 1f9cb2ee80bdafb118af6730d3efa60593905c70..28c6ec97a8977b05ffa07d79cee0399740d4baba 100644 (file)
--- a/test/scripts/0000-Basic/0023
+++ b/test/scripts/0000-Basic/0023
@@ -331,3 +331,9 @@ rcpt to:<x@y>
 rcpt to:<x1@y>
 quit
 ****
+exim -bh 60.60.60.60
+mail from:<x@y>
+rcpt to:<x@y>
+rcpt to:<a@b>
+quit
+****

diff --git a/test/stderr/0023 b/test/stderr/0023
index b067cce5a7616abe30267e6dc76239f86e33bc72..d54ccab128af055bb32e727ea8d261f484262fdb 100644 (file)
--- a/test/stderr/0023
+++ b/test/stderr/0023
@@ -1168,3 +1168,34 @@ LOG: DNS list lookup defer (probably timeout) for 1.44.44.44.test.again.dns: ret
 LOG: H=[44.44.44.1] Warning: ACL "warn" statement skipped: condition test deferred
 >>> processing "accept"
 >>> accept: condition test succeeded
+>>> host in hosts_connection_nolog? no (option unset)
+>>> host in host_lookup? no (option unset)
+>>> host in host_reject_connection? no (option unset)
+>>> host in sender_unqualified_hosts? no (option unset)
+>>> host in recipient_unqualified_hosts? no (option unset)
+>>> host in helo_verify_hosts? no (option unset)
+>>> host in helo_try_verify_hosts? no (option unset)
+>>> host in helo_accept_junk_hosts? no (option unset)
+>>> using ACL "acl_60_60_60"
+>>> processing "accept"
+>>> check !acl = TESTSUITE/aux-fixed/0023.acl2
+>>> read ACL from file TESTSUITE/aux-fixed/0023.acl2
+>>> processing "accept"
+>>> check domains = b
+>>> y in "b"? no (end of list)
+>>> accept: condition test failed
+>>> end of ACL "TESTSUITE/aux-fixed/0023.acl2": implicit DENY
+>>> accept: condition test succeeded
+>>> using ACL "acl_60_60_60"
+>>> processing "accept"
+>>> check !acl = TESTSUITE/aux-fixed/0023.acl2
+>>> using ACL "TESTSUITE/aux-fixed/0023.acl2"
+>>> processing "accept"
+>>> check domains = b
+>>> b in "b"? yes (matched "b")
+>>> check local_parts = a
+>>> a in "a"? yes (matched "a")
+>>> accept: condition test succeeded
+>>> accept: condition test failed
+>>> end of ACL "acl_60_60_60": implicit DENY
+LOG: H=[60.60.60.60] F=<x@y> rejected RCPT <a@b>

diff --git a/test/stdout/0023 b/test/stdout/0023
index b52b10b5edad5b0e79277ea4f09193c05c95ec42..e7eb769ee0c3624a4c4e1978bf17951dd96988bc 100644 (file)
--- a/test/stdout/0023
+++ b/test/stdout/0023
@@ -455,3 +455,13 @@
 550 host in DNS list rbl.test.ex: This is a test blacklisting message\r
 550 host in DNS list rbl.test.ex: This is a test blacklisting message\r
 221 myhost.test.ex closing connection\r
+
+**** SMTP testing session as if from host 60.60.60.60
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 OK\r
+250 Accepted\r
+550 Administrative prohibition\r
+221 myhost.test.ex closing connection\r