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
TLS: event for daemon accept fail
[exim.git]
/
test
/
confs
/
2033
diff --git
a/test/confs/2033
b/test/confs/2033
index 944c5e7ca0f13f8bd2134f9b52fa8070db867253..44ebbc5949de488772f9976ec2368658f3974ee1 100644
(file)
--- a/
test/confs/2033
+++ b/
test/confs/2033
@@
-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
FX = DIR/aux-fixed
S1 = FX/exim-ca/example.com/server1.example.com
FX = DIR/aux-fixed
S1 = FX/exim-ca/example.com/server1.example.com
@@
-40,9
+35,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 -----
@@
-86,7
+78,7
@@
client_r:
client_s:
driver = accept
client_s:
driver = accept
- local_parts = users
+ local_parts = user
_
s
retry_use_local_part
transport = send_to_server_req_passname
retry_use_local_part
transport = send_to_server_req_passname
@@
-105,10
+97,9
@@
send_to_server_failcert:
driver = smtp
allow_localhost
hosts = HOSTIPV4
driver = smtp
allow_localhost
hosts = HOSTIPV4
- hosts_require_tls = HOSTIPV4
port = PORT_D
port = PORT_D
- tls_certificate = CERT2
- tls_privatekey = CERT2
+ hosts_try_fastopen = :
+ hosts_require_tls = HOSTIPV4
tls_verify_certificates = CA2
tls_verify_certificates = CA2
@@
-117,10
+108,9
@@
send_to_server_retry:
driver = smtp
allow_localhost
hosts = HOSTIPV4 : 127.0.0.1
driver = smtp
allow_localhost
hosts = HOSTIPV4 : 127.0.0.1
- hosts_require_tls = HOSTIPV4
port = PORT_D
port = PORT_D
- tls_certificate = CERT2
- tls_privatekey = CERT2
+ hosts_try_fastopen = :
+ hosts_require_tls = HOSTIPV4
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}}
@@
-130,10
+120,9
@@
send_to_server_crypt:
driver = smtp
allow_localhost
hosts = HOSTIPV4
driver = smtp
allow_localhost
hosts = HOSTIPV4
- hosts_require_tls = HOSTIPV4
port = PORT_D
port = PORT_D
- tls_certificate = CERT2
- tls_privatekey = CERT2
+ hosts_try_fastopen = :
+ hosts_require_tls = HOSTIPV4
tls_verify_certificates = CA2
tls_try_verify_hosts = *
tls_verify_certificates = CA2
tls_try_verify_hosts = *
@@
-145,8
+134,7
@@
send_to_server_req_fail:
allow_localhost
hosts = HOSTNAME
port = PORT_D
allow_localhost
hosts = HOSTNAME
port = PORT_D
- tls_certificate = CERT2
- tls_privatekey = CERT2
+ hosts_try_fastopen = :
tls_verify_certificates = CA2
tls_verify_hosts = *
tls_verify_certificates = CA2
tls_verify_hosts = *
@@
-158,8
+146,7
@@
send_to_server_req_failname:
allow_localhost
hosts = HOSTNAME
port = PORT_D
allow_localhost
hosts = HOSTNAME
port = PORT_D
- tls_certificate = CERT2
- tls_privatekey = CERT2
+ hosts_try_fastopen = :
tls_verify_certificates = CA1
tls_verify_cert_hostnames = *
tls_verify_certificates = CA1
tls_verify_cert_hostnames = *
@@
-172,8
+159,7
@@
send_to_server_req_passname:
allow_localhost
hosts = server1.example.com
port = PORT_D
allow_localhost
hosts = server1.example.com
port = PORT_D
- tls_certificate = CERT2
- tls_privatekey = CERT2
+ hosts_try_fastopen = :
tls_verify_certificates = CA1
tls_verify_cert_hostnames = *
tls_verify_certificates = CA1
tls_verify_cert_hostnames = *
@@
-186,8
+172,7
@@
send_to_server_req_failcarryon:
allow_localhost
hosts = HOSTNAME
port = PORT_D
allow_localhost
hosts = HOSTNAME
port = PORT_D
- tls_certificate = CERT2
- tls_privatekey = CERT2
+ hosts_try_fastopen = :
tls_verify_certificates = CA1
tls_verify_cert_hostnames = *
tls_verify_certificates = CA1
tls_verify_cert_hostnames = *