summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2006-06-27 15:07:18 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2006-06-27 15:07:18 +0000
commitb8dc3e4a6769d5b233b1117f16b334a583716b10 (patch)
treed6b297299244950e192ef45814adca0bf32c283b /test
parent4608d6834bf682e578a5d907a2f6b8fb674c07a0 (diff)
Fix Bugzilla #101: macro definition between ACLs doesn't work.
Diffstat (limited to 'test')
-rw-r--r--test/confs/053430
-rw-r--r--test/scripts/0000-Basic/05344
-rw-r--r--test/stderr/053413
-rw-r--r--test/stdout/05347
4 files changed, 54 insertions, 0 deletions
diff --git a/test/confs/0534 b/test/confs/0534
new file mode 100644
index 000000000..b148987a5
--- /dev/null
+++ b/test/confs/0534
@@ -0,0 +1,30 @@
+# Exim test configuration 0534
+
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+primary_hostname = myhost.test.ex
+rfc1413_query_timeout = 0s
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+
+# ----- Main settings -----
+
+acl_smtp_connect = two
+
+
+# ----- ACLs -----
+
+begin ACL
+
+one:
+ accept hosts = 1.2.3.4
+
+MACRO_DEFINITION=5.6.7.8
+
+two:
+ accept hosts = MACRO_DEFINITION
+
+
+# End
diff --git a/test/scripts/0000-Basic/0534 b/test/scripts/0000-Basic/0534
new file mode 100644
index 000000000..b1a992e88
--- /dev/null
+++ b/test/scripts/0000-Basic/0534
@@ -0,0 +1,4 @@
+# Macro definition between ACLs
+exim -bh 5.6.7.8
+quit
+****
diff --git a/test/stderr/0534 b/test/stderr/0534
new file mode 100644
index 000000000..d7fd3e150
--- /dev/null
+++ b/test/stderr/0534
@@ -0,0 +1,13 @@
+>>> 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 "two"
+>>> processing "accept"
+>>> check hosts = 5.6.7.8
+>>> host in "5.6.7.8"? yes (matched "5.6.7.8")
+>>> accept: condition test succeeded
diff --git a/test/stdout/0534 b/test/stdout/0534
new file mode 100644
index 000000000..1172c46fa
--- /dev/null
+++ b/test/stdout/0534
@@ -0,0 +1,7 @@
+
+**** SMTP testing session as if from host 5.6.7.8
+**** 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
+221 myhost.test.ex closing connection