diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-06-28 16:00:23 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-06-28 16:00:23 +0000 |
| commit | 45b915963e2e3721fc65c7c3f50f2f65f5c54d1b (patch) | |
| tree | 7925d3671d311a16fded661f35e54b19a83e8e2b /test | |
| parent | b4a9bda23dd6b1941ac1cf53093e0eacf485b34f (diff) | |
Add acl_not_smtp_start ACL (mostly Johannes Berg's patch).
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0535 | 46 | ||||
| -rw-r--r-- | test/log/0535 | 6 | ||||
| -rw-r--r-- | test/mail/0535.userx | 20 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0535 | 7 |
4 files changed, 79 insertions, 0 deletions
diff --git a/test/confs/0535 b/test/confs/0535 new file mode 100644 index 000000000..6504807f9 --- /dev/null +++ b/test/confs/0535 @@ -0,0 +1,46 @@ +# Exim test configuration 0535 + +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_start = one +trusted_users = CALLER + + +# ----- ACLs ----- + +begin ACL + +one: + warn senders = ^nofix@ + control = suppress_local_fixups + add_header = X-Added: $recipients + +# ----- Routers ----- + +begin routers + +r1: + driver = accept + transport = t1 + + +# ----- Transports ----- + +begin transports + +t1: + driver = appendfile + user = CALLER + file = DIR/test-mail/$local_part + + +# End diff --git a/test/log/0535 b/test/log/0535 new file mode 100644 index 000000000..e737ee232 --- /dev/null +++ b/test/log/0535 @@ -0,0 +1,6 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 10HmaY-0005vi-00 <= nofix@test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/mail/0535.userx b/test/mail/0535.userx new file mode 100644 index 000000000..4ca2d6156 --- /dev/null +++ b/test/mail/0535.userx @@ -0,0 +1,20 @@ +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +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 +Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +From: CALLER_NAME <CALLER@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +No headers supplied. + +From nofix@test.ex Tue Mar 02 09:44:33 1999 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from <nofix@test.ex>) + id 10HmaY-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +X-Added: userx@test.ex + +No headers supplied. + diff --git a/test/scripts/0000-Basic/0535 b/test/scripts/0000-Basic/0535 new file mode 100644 index 000000000..237fa4c9c --- /dev/null +++ b/test/scripts/0000-Basic/0535 @@ -0,0 +1,7 @@ +# acl_not_smtp_start +exim -odi userx@test.ex +No headers supplied. +**** +exim -odi -f nofix@test.ex userx@test.ex +No headers supplied. +**** |