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
Docs: add warning note on ${listnamed:} operator
[users/heiko/exim.git]
/
test
/
confs
/
3461
diff --git
a/test/confs/3461
b/test/confs/3461
index b4843b488fa0d17e598831deafa274d9a52c8a6e..159a55376dd0129262923517d4d0b19229568a72 100644
(file)
--- a/
test/confs/3461
+++ b/
test/confs/3461
@@
-1,6
+1,7
@@
# Exim test configuration 3461
SERVER =
# Exim test configuration 3461
SERVER =
+PEX = :
.include DIR/aux-var/tls_conf_prefix
.include DIR/aux-var/tls_conf_prefix
@@
-18,11
+19,7
@@
queue_run_in_order
smtp_accept_max_nonmail = 0
tls_advertise_hosts = *
smtp_accept_max_nonmail = 0
tls_advertise_hosts = *
-
-# Set certificate only if server
-
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_certificate =DIR/aux-fixed/cert1
# ----- Authenticators -----
# ----- Authenticators -----
@@
-60,7
+57,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
@@
-68,8
+65,11
@@
send_to_server:
driver = smtp
allow_localhost
hosts = 127.0.0.1
driver = smtp
allow_localhost
hosts = 127.0.0.1
- hosts_try_auth = *
port = PORT_D
port = PORT_D
- tls_try_verify_hosts = :
+ hosts_try_fastopen = :
+ hosts_try_auth = *
+ hosts_noproxy_tls = PEX
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames = :
# End
# End