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
Utilities: harden exim_tidydb against corrupt wait-records. Bug 2343
[users/heiko/exim.git]
/
test
/
confs
/
5600
diff --git
a/test/confs/5600
b/test/confs/5600
index 018ee3a788b7936434547e26845b1e659c85f56d..7526b9cc40b7f4575cddbee9e7c3527d54516939 100644
(file)
--- a/
test/confs/5600
+++ b/
test/confs/5600
@@
-3,14
+3,9
@@
CRL=
CRL=
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
primary_hostname = server1.example.com
primary_hostname = server1.example.com
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
# ----- Main settings -----
# ----- Main settings -----
@@
-32,7
+27,7
@@
tls_verify_hosts = HOSTIPV4
tls_try_verify_hosts = *
tls_verify_certificates = DIR/aux-fixed/cert2
tls_crl = CRL
tls_try_verify_hosts = *
tls_verify_certificates = DIR/aux-fixed/cert2
tls_crl = CRL
-tls_ocsp_file =
OCSP
+tls_ocsp_file =
RETURN
# ------ ACL ------
# ------ ACL ------
@@
-71,7
+66,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