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
/
5720
diff --git
a/test/confs/5720
b/test/confs/5720
index ca0b1974459b236a28fd5c53644708f01b2e833c..281fb8f50f8c98c92248287e78da68a8213c3f66 100644
(file)
--- a/
test/confs/5720
+++ b/
test/confs/5720
@@
-3,14
+3,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
timezone = UTC
# ----- Main settings -----
timezone = UTC
# ----- Main settings -----
@@
-68,12
+63,19
@@
ev_msg:
logwrite = ${certextract {subj_altname,>;}{$tls_out_peercert}{SAN <$value>}{(no SAN)}}
logwrite = ${certextract {ocsp_uri} {$tls_out_peercert} {OCU <$value>}{(no OCU)}}
logwrite = ${certextract {crl_uri} {$tls_out_peercert} {CRU <$value>}{(no CRU)}}
logwrite = ${certextract {subj_altname,>;}{$tls_out_peercert}{SAN <$value>}{(no SAN)}}
logwrite = ${certextract {ocsp_uri} {$tls_out_peercert} {OCU <$value>}{(no OCU)}}
logwrite = ${certextract {crl_uri} {$tls_out_peercert} {CRU <$value>}{(no CRU)}}
+ # output list separator changes
+ logwrite = ${certextract {subj_altname,>:,dns} {$tls_out_peercert}{SAN <$value>}{(no SAN)}}
+ logwrite = ${certextract {subj_altname,dns,>:} {$tls_out_peercert}{SAN <$value>}{(no SAN)}}
logger:
accept condition = ${if eq {msg} {${listextract{1}{$event_name}}}}
acl = ev_msg $event_name $acl_arg2
accept condition = ${if eq {tls} {${listextract{1}{$event_name}}}}
message = ${acl {ev_tls}}
logger:
accept condition = ${if eq {msg} {${listextract{1}{$event_name}}}}
acl = ev_msg $event_name $acl_arg2
accept condition = ${if eq {tls} {${listextract{1}{$event_name}}}}
message = ${acl {ev_tls}}
+ accept condition = ${if eq {smtp:ehlo}{$event_name}}
+ logwrite = $tls_out_cipher smtp:ehlo $event_data
+ logwrite = cipher_ $tls_out_cipher_std
+ logwrite = ver: $tls_out_ver
accept
# ----- Routers -----
accept
# ----- Routers -----
@@
-96,6
+98,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/exim-ca/example.com/server2.example.com/server2.example.com.pem
tls_privatekey = DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
tls_certificate = DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
tls_privatekey = DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key