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
Capture the knowlege that verification succeeded
[users/heiko/exim.git]
/
test
/
confs
/
5850
diff --git
a/test/confs/5850
b/test/confs/5850
index 53cb78ae182c5e231c54d0b2efa2714a9b752923..b2c7cb7eb3fd31ab6a04e248ece1ac33f5f175b9 100644
(file)
--- a/
test/confs/5850
+++ b/
test/confs/5850
@@
-16,7
+16,7
@@
gecos_name = CALLER_NAME
acl_smtp_rcpt = accept
acl_smtp_rcpt = accept
-log_selector = +
tls_peerdn
+log_selector = +
received_recipients +tls_peerdn +tls_certificate_verified
queue_only
queue_run_in_order
queue_only
queue_run_in_order
@@
-26,10
+26,7
@@
tls_advertise_hosts = *
# Set certificate only if server
tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
# 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_verify_hosts = *
-#tls_verify_certificates = ${if eq {SERVER}{server}{DIR/aux-fixed/cert2}fail}
+#tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
# ----- Routers -----
# ----- Routers -----
@@
-37,9
+34,10
@@
tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
begin routers
client:
begin routers
client:
- driver =
accept
+ driver =
dnslookup
condition = ${if eq {SERVER}{server}{no}{yes}}
condition = ${if eq {SERVER}{server}{no}{yes}}
- retry_use_local_part
+ dnssec_request_domains = *
+ self = send
transport = send_to_server
server:
transport = send_to_server
server:
@@
-54,11
+52,7
@@
begin transports
send_to_server:
driver = smtp
allow_localhost
send_to_server:
driver = smtp
allow_localhost
- hosts = 127.0.0.1
port = PORT_D
port = PORT_D
-# tls_certificate = DIR/aux-fixed/cert2
-# tls_privatekey = DIR/aux-fixed/cert2
-# tls_verify_certificates = DIR/aux-fixed/cert2
# hosts_try_dane = *
hosts_require_dane = *
# hosts_try_dane = *
hosts_require_dane = *