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
Fix CVE-2016-1531
[users/heiko/exim.git]
/
test
/
confs
/
0218
diff --git
a/test/confs/0218
b/test/confs/0218
index a585870ef1bc0bd9d56035004e0dfea25a033bc9..fae18f0e13b7f7e14efb9945ea0bc74e97e563db 100644
(file)
--- a/
test/confs/0218
+++ b/
test/confs/0218
@@
-1,13
+1,14
@@
# Exim test configuration 0218
exim_path = EXIM_PATH
# Exim test configuration 0218
exim_path = EXIM_PATH
+keep_environment =
host_lookup_order = bydns
primary_hostname = myhost.test.ex
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
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
+tls_advertise_hosts =
# ----- Main settings -----
# ----- Main settings -----
@@
-19,6
+20,13
@@
queue_run_in_order
queue_only
queue_only
+# ----- ACLs ----
+
+begin acl
+
+expand_check:
+ accept message = ACL
+
# ----- Routers -----
begin routers
# ----- Routers -----
begin routers
@@
-30,11
+38,13
@@
bounce:
data = :fail: just discard
retry_use_local_part
senders = :
data = :fail: just discard
retry_use_local_part
senders = :
+ debug_print = R: $router_name (${acl {expand_check}})
client:
driver = accept
retry_use_local_part
transport = send_to_server
client:
driver = accept
retry_use_local_part
transport = send_to_server
+ debug_print = R: $router_name (${acl {expand_check}})
# ----- Transports -----
# ----- Transports -----
@@
-47,6
+57,7
@@
send_to_server:
command_timeout = 1s
hosts = 127.0.0.1
port = PORT_S
command_timeout = 1s
hosts = 127.0.0.1
port = PORT_S
+ debug_print = T: $transport_name (${acl {expand_check}})
# ----- Retry -----
# ----- Retry -----