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: mark more command-line arguments
[users/heiko/exim.git]
/
test
/
confs
/
2127
diff --git
a/test/confs/2127
b/test/confs/2127
index da7d2867f6ba9731e038c2c3cd3ce2a5da1aa33d..148eb7ef04a8a9e938562ca7151db06571ab213b 100644
(file)
--- a/
test/confs/2127
+++ b/
test/confs/2127
@@
-2,14
+2,9
@@
SERVER =
SERVER =
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
primary_hostname = myhost.test.ex
primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
# ----- Main settings -----
# ----- Main settings -----
@@
-25,6
+20,10
@@
tls_try_verify_hosts = 127.0.0.1
tls_verify_hosts = HOSTIPV4
tls_verify_certificates = DIR/aux-fixed/cert1
tls_verify_hosts = HOSTIPV4
tls_verify_certificates = DIR/aux-fixed/cert1
+tls_require_ciphers = -ALL:kRSA
+.ifdef _OPT_OPENSSL_NO_TLSV1_3_X
+openssl_options = +no_tlsv1_3
+.endif
# ----- Routers -----
begin routers
# ----- Routers -----
begin routers
@@
-47,7
+46,7
@@
begin transports
local_delivery:
driver = appendfile
local_delivery:
driver = appendfile
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
user = CALLER
headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
user = CALLER
@@
-56,6
+55,7
@@
send_to_server:
allow_localhost
hosts = ${if eq{$local_part}{userx}{127.0.0.1}{HOSTIPV4}}
port = PORT_D
allow_localhost
hosts = ${if eq{$local_part}{userx}{127.0.0.1}{HOSTIPV4}}
port = PORT_D
+ hosts_try_fastopen = :
tls_try_verify_hosts = :
# End
tls_try_verify_hosts = :
# End