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
OpenSSL: Fix aggregation of messages.
[exim.git]
/
test
/
confs
/
2112
diff --git
a/test/confs/2112
b/test/confs/2112
index d21fee0648f04b7c9241e37192cce98942a0549e..005925e111b720776cf6d8eec5cced3b3e1720d1 100644
(file)
--- a/
test/confs/2112
+++ b/
test/confs/2112
@@
-3,14
+3,9
@@
SERVER=
SERVER=
-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
-rfc1413_query_timeout = 0s
-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
@@
-26,7
+21,7
@@
KEY2 = FX/cert2
acl_smtp_rcpt = accept
acl_smtp_rcpt = accept
-log_selector = +tls_peerdn+tls_certificate_verified
+log_selector = +tls_peerdn+tls_certificate_verified
+received_recipients
queue_only
queue_run_in_order
queue_only
queue_run_in_order
@@
-84,7
+79,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
@@
-149,8
+144,8
@@
send_to_server_req_fail:
tls_verify_hosts = *
tls_verify_cert_hostnames =
tls_verify_hosts = *
tls_verify_cert_hostnames =
-
# this will fail to verify the cert name and fallback to unencrypted
-
send_to_server_req_failname:
+# this will fail to verify the cert name and fallback to unencrypted
+send_to_server_req_failname:
driver = smtp
allow_localhost
hosts = HOSTIPV4
driver = smtp
allow_localhost
hosts = HOSTIPV4
@@
-162,8
+157,8
@@
send_to_server_req_fail:
tls_verify_cert_hostnames = server1.example.net : server1.example.org
tls_verify_hosts = *
tls_verify_cert_hostnames = server1.example.net : server1.example.org
tls_verify_hosts = *
-
# this will pass the cert verify including name check
-
send_to_server_req_passname:
+# this will pass the cert verify including name check
+send_to_server_req_passname:
driver = smtp
allow_localhost
hosts = HOSTIPV4
driver = smtp
allow_localhost
hosts = HOSTIPV4