From 0b26748a086e4c95ee2e817eaac852d498071ca8 Mon Sep 17 00:00:00 2001 From: Philip Hazel Date: Wed, 19 Apr 2006 11:11:12 +0000 Subject: [PATCH] Add a test for "!acl=" which was missing (and would have picked up a bug in 4.61). --- test/aux-fixed/0023.acl2 | 2 ++ test/confs/0023 | 3 +++ test/scripts/0000-Basic/0023 | 6 ++++++ test/stderr/0023 | 31 +++++++++++++++++++++++++++++++ test/stdout/0023 | 10 ++++++++++ 5 files changed, 52 insertions(+) create mode 100644 test/aux-fixed/0023.acl2 diff --git a/test/aux-fixed/0023.acl2 b/test/aux-fixed/0023.acl2 new file mode 100644 index 000000000..044eada22 --- /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 62e444a5d..be99eb00f 100644 --- 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 1f9cb2ee8..28c6ec97a 100644 --- a/test/scripts/0000-Basic/0023 +++ b/test/scripts/0000-Basic/0023 @@ -331,3 +331,9 @@ rcpt to: rcpt to: quit **** +exim -bh 60.60.60.60 +mail from: +rcpt to: +rcpt to: +quit +**** diff --git a/test/stderr/0023 b/test/stderr/0023 index b067cce5a..d54ccab12 100644 --- 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= rejected RCPT diff --git a/test/stdout/0023 b/test/stdout/0023 index b52b10b5e..e7eb769ee 100644 --- 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 550 host in DNS list rbl.test.ex: This is a test blacklisting message 221 myhost.test.ex closing connection + +**** 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 +250 OK +250 Accepted +550 Administrative prohibition +221 myhost.test.ex closing connection -- 2.30.2