diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0233 | 4 | ||||
| -rw-r--r-- | test/log/0233 | 13 | ||||
| -rw-r--r-- | test/mail/0233.me | 20 | ||||
| -rw-r--r-- | test/msglog/0233.10HmbB-0005vi-00 | 2 | ||||
| -rw-r--r-- | test/msglog/0233.10HmbD-0005vi-00 | 2 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0233 | 15 | ||||
| -rw-r--r-- | test/stdout/0233 | 9 |
7 files changed, 57 insertions, 8 deletions
diff --git a/test/confs/0233 b/test/confs/0233 index cbd87c4b7..15c605c24 100644 --- a/test/confs/0233 +++ b/test/confs/0233 @@ -23,7 +23,9 @@ system_filter_reply_transport = address_reply begin acl rcpt: - accept control = freeze + accept local_parts = usery + control = freeze + accept control = freeze/no_tell # ----- Routers ----- diff --git a/test/log/0233 b/test/log/0233 index ac592afee..dd3861f85 100644 --- a/test/log/0233 +++ b/test/log/0233 @@ -9,6 +9,13 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Frozen by the system filter: system filter freezes 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 frozen by ACL -1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss -1999-03-02 09:44:33 10HmbB-0005vi-00 => me <me@myhost.test.ex> R=all T=local_delivery -1999-03-02 09:44:33 10HmbB-0005vi-00 Completed +1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss +1999-03-02 09:44:33 10HmbB-0005vi-00 frozen by ACL +1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=EXIMUSER P=local S=sss +1999-03-02 09:44:33 10HmbC-0005vi-00 => me <me@myhost.test.ex> R=all T=local_delivery +1999-03-02 09:44:33 10HmbC-0005vi-00 Completed +1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss +1999-03-02 09:44:33 10HmbD-0005vi-00 frozen by ACL +1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmbD-0005vi-00 U=EXIMUSER P=local S=sss +1999-03-02 09:44:33 10HmbE-0005vi-00 => me <me@myhost.test.ex> R=all T=local_delivery +1999-03-02 09:44:33 10HmbE-0005vi-00 Completed diff --git a/test/mail/0233.me b/test/mail/0233.me index e8e8c8f33..1e9b1086c 100644 --- a/test/mail/0233.me +++ b/test/mail/0233.me @@ -18,15 +18,29 @@ The following address(es) have yet to be delivered: From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) - id 10HmbB-0005vi-00 + id 10HmbC-0005vi-00 for me@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Auto-Submitted: auto-replied From: Mail Delivery System <Mailer-Daemon@myhost.test.ex> To: me@myhost.test.ex Subject: Message frozen on arrival -Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbC-0005vi-00@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message 10HmbA-0005vi-00 was frozen on arrival by ACL. +Message 10HmbB-0005vi-00 was frozen on arrival by ACL. +The sender is <CALLER@myhost.test.ex>. + +From MAILER-DAEMON Tue Mar 02 09:44:33 1999 +Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) + id 10HmbE-0005vi-00 + for me@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Auto-Submitted: auto-replied +From: Mail Delivery System <Mailer-Daemon@myhost.test.ex> +To: me@myhost.test.ex +Subject: Message frozen on arrival +Message-Id: <E10HmbE-0005vi-00@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +Message 10HmbD-0005vi-00 was frozen on arrival by ACL. The sender is <CALLER@myhost.test.ex>. diff --git a/test/msglog/0233.10HmbB-0005vi-00 b/test/msglog/0233.10HmbB-0005vi-00 new file mode 100644 index 000000000..0840c1df2 --- /dev/null +++ b/test/msglog/0233.10HmbB-0005vi-00 @@ -0,0 +1,2 @@ +1999-03-02 09:44:33 Received from CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss +1999-03-02 09:44:33 frozen by ACL diff --git a/test/msglog/0233.10HmbD-0005vi-00 b/test/msglog/0233.10HmbD-0005vi-00 new file mode 100644 index 000000000..0840c1df2 --- /dev/null +++ b/test/msglog/0233.10HmbD-0005vi-00 @@ -0,0 +1,2 @@ +1999-03-02 09:44:33 Received from CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss +1999-03-02 09:44:33 frozen by ACL diff --git a/test/scripts/0000-Basic/0233 b/test/scripts/0000-Basic/0233 index 0acb13fca..13726815c 100644 --- a/test/scripts/0000-Basic/0233 +++ b/test/scripts/0000-Basic/0233 @@ -1,12 +1,25 @@ # freeze_tell & system filter & ACL +# System filter freezes this one exim -odi userx Rhubarb **** +# ACL freezes these two, tell for the second, and third, not for the first exim -odi -bs mail from:<a@test.ex> +rcpt to:<userz@test.ex> +data +Should be frozen (no tell) +. +mail from:<a@test.ex> +rcpt to:<usery@test.ex> +data +Should be frozen (with tell) +. +mail from:<a@test.ex> +rcpt to:<userz@test.ex> rcpt to:<usery@test.ex> data -Should be frozen +Should be frozen (with tell because not both no_tell) . quit **** diff --git a/test/stdout/0233 b/test/stdout/0233 index 773412dc5..0644977a2 100644 --- a/test/stdout/0233 +++ b/test/stdout/0233 @@ -3,4 +3,13 @@ 250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbA-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbB-0005vi-00
+250 OK
+250 Accepted
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbD-0005vi-00
221 myhost.test.ex closing connection
|