git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LibreSSL: fixes pulled from OpenBSD patchset
[exim.git]
/
test
/
confs
/
3462
diff --git
a/test/confs/3462
b/test/confs/3462
index 3907aecef51265ab97138b7dc358eda056b37d68..93b5fa1eca1b49fce9e99d58cf666a2a3a848ab3 100644
(file)
--- a/
test/confs/3462
+++ b/
test/confs/3462
@@
-2,14
+2,9
@@
SERVER =
SERVER =
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
primary_hostname = myhost.test.ex
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
# ----- Main settings -----
# ----- Main settings -----
@@
-21,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 -----
@@
-65,6
+56,7
@@
begin transports
local_delivery:
driver = appendfile
file = DIR/test-mail/$local_part
local_delivery:
driver = appendfile
file = DIR/test-mail/$local_part
+ create_file = DIR/test-mail
headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
user = CALLER
headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
user = CALLER
@@
-72,9
+64,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 = *
+ tls_verify_certificates = DIR/aux-fixed/cert1
+ tls_verify_cert_hostnames = :
# ----- Retry -----
# ----- Retry -----