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
Taint: fix ACL "spam" condition, to permit tainted name arguments.
[users/heiko/exim.git]
/
test
/
confs
/
2130
diff --git
a/test/confs/2130
b/test/confs/2130
index 6040c1fa64e4afba89f484b3f04ab58fc5811a15..4afded1cf2e7e1320ee95c94554494c59d0e184c 100644
(file)
--- a/
test/confs/2130
+++ b/
test/confs/2130
@@
-3,15
+3,9
@@
SERVER =
SERVER =
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
+primary_hostname = myhost.test.ex
# ----- Main settings -----
# ----- Main settings -----
@@
-59,6
+53,7
@@
send_to_server1:
allow_localhost
hosts = HOSTIPV4
port = PORT_D
allow_localhost
hosts = HOSTIPV4
port = PORT_D
+ hosts_try_fastopen = :
tls_sni = fred
tls_try_verify_hosts = :
tls_sni = fred
tls_try_verify_hosts = :
@@
-67,6
+62,7
@@
send_to_server2:
allow_localhost
hosts = HOSTIPV4
port = PORT_D
allow_localhost
hosts = HOSTIPV4
port = PORT_D
+ hosts_try_fastopen = :
tls_try_verify_hosts = :
tls_try_verify_hosts = :