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
malware: fix ClamAV file send corking
[users/heiko/exim.git]
/
test
/
confs
/
3462
diff --git
a/test/confs/3462
b/test/confs/3462
index 3f8c401de5aac57152bec56c153c2cff63b7c5ff..75385a029bca552d78cd5007949de74e50ad19b1 100644
(file)
--- a/
test/confs/3462
+++ b/
test/confs/3462
@@
-16,11
+16,7
@@
queue_only
queue_run_in_order
tls_advertise_hosts = *
queue_run_in_order
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 -----
@@
-59,7
+55,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
@@
-70,7
+66,8
@@
send_to_server:
port = PORT_D
hosts_try_fastopen = :
hosts_try_auth = *
port = PORT_D
hosts_try_fastopen = :
hosts_try_auth = *
- tls_try_verify_hosts = :
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames = :
# ----- Retry -----
# ----- Retry -----