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
/
2100
diff --git
a/test/confs/2100
b/test/confs/2100
index c6a7e698e4a4812c335dcc88b63dd02ca588d28d..6425f3a0fee021dae33d49469ba09100f93c66cc 100644
(file)
--- a/
test/confs/2100
+++ b/
test/confs/2100
@@
-2,15
+2,13
@@
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
+.ifdef _HAVE_TLS
+# that was purely to trigger the lazy-create of builtin macros
+.endif
# ----- Main settings -----
acl_smtp_rcpt = accept
# ----- Main settings -----
acl_smtp_rcpt = accept
@@
-22,13
+20,10
@@
queue_run_in_order
tls_advertise_hosts = *
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
tls_verify_hosts = *
tls_verify_hosts = *
-tls_verify_certificates =
${if eq {SERVER}{server}{DIR/aux-fixed/cert2}fail}
+tls_verify_certificates =
DIR/aux-fixed/cert2
# ----- Routers -----
# ----- Routers -----
@@
-51,6
+46,7
@@
send_to_server:
allow_localhost
hosts = 127.0.0.1
port = PORT_D
allow_localhost
hosts = 127.0.0.1
port = PORT_D
+ hosts_try_fastopen = :
tls_certificate = DIR/aux-fixed/cert2
tls_privatekey = DIR/aux-fixed/cert2
tls_verify_certificates = DIR/aux-fixed/cert2
tls_certificate = DIR/aux-fixed/cert2
tls_privatekey = DIR/aux-fixed/cert2
tls_verify_certificates = DIR/aux-fixed/cert2