Add log_reject_target as an ACL modifier.

7 files changed, 118 insertions, 0 deletions

diff --git a/test/confs/0539 b/test/confs/0539
new file mode 100644
index 000000000..02b7a2622
--- /dev/null
+++ b/test/confs/0539
@@ -0,0 +1,59 @@
+# Exim test configuration 0539
+
+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_not_smtp = not_smtp
+acl_smtp_mail = check_mail
+acl_smtp_rcpt = check_rcpt
+acl_smtp_predata = predata
+
+
+# ----- ACLs -----
+
+begin acl
+
+check_mail:
+  deny  senders = main@test.ex
+        log_reject_target = main
+  deny  senders = reject@test.ex
+        log_reject_target = reject
+  deny  senders = both@test.ex
+        log_reject_target = <, main, reject
+  deny  senders = panic@test.ex
+        log_reject_target = panic
+  deny  senders = none@test.ex
+        log_reject_target =
+  accept
+
+check_rcpt:
+  deny  local_parts = main
+        log_reject_target = main
+  deny  local_parts = reject
+        log_reject_target = reject
+  deny  local_parts = both
+        log_reject_target = <, main, reject
+  deny  local_parts = panic
+        log_reject_target = panic
+  deny  local_parts = none
+        log_reject_target =
+  accept
+
+predata:
+  deny  log_reject_target = main
+        log_message = Not today
+
+not_smtp:
+  deny  log_reject_target = reject
+        log_message = Nyet
+
+
+# End
diff --git a/test/log/0539 b/test/log/0539
new file mode 100644
index 000000000..b6787e7b7
--- /dev/null
+++ b/test/log/0539
@@ -0,0 +1,5 @@
+1999-03-02 09:44:33 U=CALLER rejected MAIL <main@test.ex>
+1999-03-02 09:44:33 U=CALLER rejected MAIL <both@test.ex>
+1999-03-02 09:44:33 U=CALLER F=<ok@test.ex> rejected RCPT <main@test.ex>
+1999-03-02 09:44:33 U=CALLER F=<ok@test.ex> rejected RCPT <both@test.ex>
+1999-03-02 09:44:33 U=CALLER rejected DATA: Not today
diff --git a/test/paniclog/0539 b/test/paniclog/0539
new file mode 100644
index 000000000..84edf4d2d
--- /dev/null
+++ b/test/paniclog/0539
@@ -0,0 +1,2 @@
+1999-03-02 09:44:33 U=CALLER rejected MAIL <panic@test.ex>
+1999-03-02 09:44:33 U=CALLER F=<ok@test.ex> rejected RCPT <panic@test.ex>
diff --git a/test/rejectlog/0539 b/test/rejectlog/0539
new file mode 100644
index 000000000..74da8e6e1
--- /dev/null
+++ b/test/rejectlog/0539
@@ -0,0 +1,14 @@
+1999-03-02 09:44:33 U=CALLER rejected MAIL <reject@test.ex>
+1999-03-02 09:44:33 U=CALLER rejected MAIL <both@test.ex>
+1999-03-02 09:44:33 U=CALLER F=<ok@test.ex> rejected RCPT <reject@test.ex>
+1999-03-02 09:44:33 U=CALLER F=<ok@test.ex> rejected RCPT <both@test.ex>
+1999-03-02 09:44:33 10HmaX-0005vi-00 F=<CALLER@myhost.test.ex> rejected by non-SMTP ACL: Nyet
+Envelope-from: <CALLER@myhost.test.ex>
+Envelope-to: <userx@test.ex>
+P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+F From: CALLER_NAME <CALLER@myhost.test.ex>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/scripts/0000-Basic/0539 b/test/scripts/0000-Basic/0539
new file mode 100644
index 000000000..193047aa0
--- /dev/null
+++ b/test/scripts/0000-Basic/0539
@@ -0,0 +1,20 @@
+# log_reject_target
+exim -bs
+mail from:<main@test.ex>
+mail from:<reject@test.ex>
+mail from:<both@test.ex>
+mail from:<panic@test.ex>
+mail from:<none@test.ex>
+mail from:<ok@test.ex>
+rcpt to:<main@test.ex>
+rcpt to:<reject@test.ex>
+rcpt to:<both@test.ex>
+rcpt to:<panic@test.ex>
+rcpt to:<none@test.ex>
+rcpt to:<ok@test.ex>
+data
+quit
+****
+1
+exim -oep userx@test.ex
+****
diff --git a/test/stderr/0539 b/test/stderr/0539
new file mode 100644
index 000000000..00e0000bf
--- /dev/null
+++ b/test/stderr/0539
@@ -0,0 +1,3 @@
+1999-03-02 09:44:33 U=CALLER rejected MAIL <panic@test.ex>
+1999-03-02 09:44:33 U=CALLER F=<ok@test.ex> rejected RCPT <panic@test.ex>
+exim: message rejected by non-SMTP ACL: local configuration problem
diff --git a/test/stdout/0539 b/test/stdout/0539
new file mode 100644
index 000000000..d260b66cc
--- /dev/null
+++ b/test/stdout/0539
@@ -0,0 +1,15 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+550 Administrative prohibition

+550 Administrative prohibition

+550 Administrative prohibition

+550 Administrative prohibition

+550 Administrative prohibition

+250 OK

+550 Administrative prohibition

+550 Administrative prohibition

+550 Administrative prohibition

+550 Administrative prohibition

+550 Administrative prohibition

+250 Accepted

+550 Administrative prohibition

+221 myhost.test.ex closing connection