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
Fix non-TLS build
[users/heiko/exim.git]
/
test
/
confs
/
2114
diff --git
a/test/confs/2114
b/test/confs/2114
index d652c0633818e131aec76cb9c96474b8da9c21b2..17d5ff2d1b1e54fed38e80e5efaa8b1738caaff4 100644
(file)
--- a/
test/confs/2114
+++ b/
test/confs/2114
@@
-2,13
+2,9
@@
CRL=
CRL=
-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
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
# ----- Main settings -----
# ----- Main settings -----
@@
-26,7
+22,7
@@
tls_privatekey = DIR/aux-fixed/cert1
tls_verify_hosts = HOSTIPV4
tls_try_verify_hosts = *
tls_verify_hosts = HOSTIPV4
tls_try_verify_hosts = *
-tls_verify_certificates = DIR/aux-fixed/
cert2
+tls_verify_certificates = DIR/aux-fixed/
exim-ca/example.com/server1.example.com/ca_chain.pem
tls_crl = CRL
tls_crl = CRL
@@
-35,7
+31,7
@@
tls_crl = CRL
begin acl
check_recipient:
begin acl
check_recipient:
- deny message = certificate not verified: peerdn=$tls_peerdn
+ deny message = certificate not verified: peerdn=$tls_
in_
peerdn
! verify = certificate
accept
! verify = certificate
accept
@@
-56,8
+52,8
@@
begin transports
local_delivery:
driver = appendfile
local_delivery:
driver = appendfile
- file = DIR/test-mail/$
local_part
- headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
+ file = DIR/test-mail/$
{bless:$local_part}
+ headers_add = TLS: cipher=$tls_cipher peerdn=$tls_
in_
peerdn
user = CALLER
# End
user = CALLER
# End