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
DMARC: expand main-config options. Bug 3102
[exim.git]
/
test
/
confs
/
2012
diff --git
a/test/confs/2012
b/test/confs/2012
index c0ed029c5a9985f72e336a58033079bb2380b885..8de185b640d285be9eacf130a61bfa71a472cdc0 100644
(file)
--- a/
test/confs/2012
+++ b/
test/confs/2012
@@
-33,9
+33,6
@@
tls_advertise_hosts = *
tls_certificate = ${if eq {SERVER}{server}{CERT1}fail}
tls_privatekey = ${if eq {SERVER}{server}{KEY1}fail}
tls_certificate = ${if eq {SERVER}{server}{CERT1}fail}
tls_privatekey = ${if eq {SERVER}{server}{KEY1}fail}
-tls_verify_hosts = *
-tls_verify_certificates = ${if eq {SERVER}{server}{CERT2}fail}
-
# ----- Routers -----
# ----- Routers -----
@@
-108,8
+105,6
@@
send_to_server_failcert:
port = PORT_D
hosts_try_fastopen = :
hosts_require_tls = HOSTIPV4
port = PORT_D
hosts_try_fastopen = :
hosts_require_tls = HOSTIPV4
- tls_certificate = CERT2
- tls_privatekey = CERT2
tls_verify_certificates = CA2
tls_try_verify_hosts =
tls_verify_certificates = CA2
tls_try_verify_hosts =
@@
-123,8
+118,6
@@
send_to_server_retry:
port = PORT_D
hosts_try_fastopen = :
hosts_require_tls = HOSTIPV4
port = PORT_D
hosts_try_fastopen = :
hosts_require_tls = HOSTIPV4
- tls_certificate = CERT2
- tls_privatekey = CERT2
tls_verify_certificates = \
${if eq{$host_address}{127.0.0.1}{CA1}{CA2}}
tls_verify_certificates = \
${if eq{$host_address}{127.0.0.1}{CA1}{CA2}}
@@
-139,8
+132,6
@@
send_to_server_crypt:
port = PORT_D
hosts_try_fastopen = :
hosts_require_tls = HOSTIPV4
port = PORT_D
hosts_try_fastopen = :
hosts_require_tls = HOSTIPV4
- tls_certificate = CERT2
- tls_privatekey = CERT2
tls_verify_certificates = CA2
tls_try_verify_hosts = *
tls_verify_certificates = CA2
tls_try_verify_hosts = *
@@
-153,8
+144,6
@@
send_to_server_req_fail:
hosts = HOSTIPV4
port = PORT_D
hosts_try_fastopen = :
hosts = HOSTIPV4
port = PORT_D
hosts_try_fastopen = :
- tls_certificate = CERT2
- tls_privatekey = CERT2
tls_verify_certificates = CA2
tls_verify_hosts = *
tls_verify_certificates = CA2
tls_verify_hosts = *
@@
-167,8
+156,6
@@
send_to_server_req_fail:
hosts = serverbadname.example.com
port = PORT_D
hosts_try_fastopen = :
hosts = serverbadname.example.com
port = PORT_D
hosts_try_fastopen = :
- tls_certificate = CERT2
- tls_privatekey = CERT2
tls_verify_certificates = CA1
tls_verify_cert_hostnames = HOSTIPV4
tls_verify_certificates = CA1
tls_verify_cert_hostnames = HOSTIPV4
@@
-181,8
+168,6
@@
send_to_server_req_fail:
hosts = server1.example.com
port = PORT_D
hosts_try_fastopen = :
hosts = server1.example.com
port = PORT_D
hosts_try_fastopen = :
- tls_certificate = CERT2
- tls_privatekey = CERT2
tls_verify_certificates = CA1
tls_verify_cert_hostnames = HOSTIPV4
tls_verify_certificates = CA1
tls_verify_cert_hostnames = HOSTIPV4
@@
-195,8
+180,6
@@
send_to_server_req_fail:
hosts = serverchain1.example.com
port = PORT_D
hosts_try_fastopen = :
hosts = serverchain1.example.com
port = PORT_D
hosts_try_fastopen = :
- tls_certificate = CERT2
- tls_privatekey = CERT2
tls_verify_certificates = CA1
tls_verify_cert_hostnames = HOSTIPV4
tls_verify_certificates = CA1
tls_verify_cert_hostnames = HOSTIPV4
@@
-209,8
+192,6
@@
send_to_server_req_fail:
hosts = alternatename.server1.example.com
port = PORT_D
hosts_try_fastopen = :
hosts = alternatename.server1.example.com
port = PORT_D
hosts_try_fastopen = :
- tls_certificate = CERT2
- tls_privatekey = CERT2
tls_verify_certificates = CA1
tls_verify_cert_hostnames = HOSTIPV4
tls_verify_certificates = CA1
tls_verify_cert_hostnames = HOSTIPV4
git://git.exim.org / exim.git / blobdiff