git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testsuite: remove unused acl option from testcase
[users/heiko/exim.git]
/
test
/
confs
/
0568
diff --git
a/test/confs/0568
b/test/confs/0568
index 5731085b7c32044ec6d8323c12043e9142acf8a4..fb1ec5d6e9cd8300ca636dd949094e0fe512ea64 100644
(file)
--- a/
test/confs/0568
+++ b/
test/confs/0568
@@
-1,5
+1,4
@@
-# Exim test configuration 0568
-# Recipient callout with AUTH
+# Exim test configuration 0568: ACL regex=
exim_path = EXIM_PATH
host_lookup_order = bydns
exim_path = EXIM_PATH
host_lookup_order = bydns
@@
-10,34
+9,32
@@
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
gecos_pattern = ""
gecos_name = CALLER_NAME
+
# ----- Main settings -----
acl_smtp_rcpt = check_rcpt
# ----- Main settings -----
acl_smtp_rcpt = check_rcpt
+acl_smtp_data = check_data
+acl_not_smtp = check_data
-queue_only
+# ----- ACL -----
-# ----- Authentication -----
+begin acl
-begin authenticators
+check_rcpt:
+ accept
-plain:
- driver = plaintext
- public_name = PLAIN
- client_send = ^userx^secret
- server_advertise_condition = yes
- server_prompts = :
- server_condition = yes
- server_set_id = $auth2
+check_data:
+ warn regex = \N(THIS\s((\w+)\s)?REGEX)\N
+ message = X-Regex: Regex matched <$regex1> <$regex3>
+ warn condition = ${if !eq{$h_fakereject:}{}}
+ control = fakereject
-# ----- ACLs -----
-
-begin acl
-
-check_rcpt:
- accept verify = recipient/callout
+ warn condition = ${if !eq{$h_fakedefer:}{}}
+ control = fakedefer
+ accept
# ----- Routers -----
# ----- Routers -----
@@
-45,28
+42,16
@@
begin routers
r1:
driver = accept
r1:
driver = accept
- transport = ${if eq{force}{$domain} {t2}{t1}}
-
+ transport = t1
# ----- Transports -----
begin transports
t1:
# ----- Transports -----
begin transports
t1:
- driver = smtp
- hosts = 127.0.0.1
- port = PORT_S
- interface = 127.0.0.1
- allow_localhost
- hosts_try_auth = *
-
-t2:
- driver = smtp
- hosts = 127.0.0.1
- port = PORT_S
- interface = 127.0.0.1
- allow_localhost
- hosts_try_auth = *
- authenticated_sender= brian
+ driver = appendfile
+ file = DIR/test-mail/$local_part
+ user = CALLER
+
# End
# End