git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARC: harden versus badly-formatted AMS line
[users/jgh/exim.git]
/
test
/
confs
/
2131
diff --git
a/test/confs/2131
b/test/confs/2131
index b1719baeecf406cd18959c92a8e936d8cdf07265..43db2ac1c228dc8456061e54a9f8b3ee854f9842 100644
(file)
--- a/
test/confs/2131
+++ b/
test/confs/2131
@@
-3,22
+3,16
@@
SERVER =
SERVER =
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-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
+.include DIR/aux-var/tls_conf_prefix
+primary_hostname = myhost.test.ex
# ----- Main settings -----
domainlist local_domains = test.ex : *.test.ex
acl_smtp_rcpt = acl_log_sni
# ----- Main settings -----
domainlist local_domains = test.ex : *.test.ex
acl_smtp_rcpt = acl_log_sni
-log_selector = +tls_peerdn +tls_sni
+log_selector = +tls_peerdn +tls_sni
+received_recipients
remote_max_parallel = 1
tls_advertise_hosts = *
remote_max_parallel = 1
tls_advertise_hosts = *
@@
-73,6
+67,7
@@
send_to_server1:
port = PORT_D
tls_sni = fred
hosts_require_tls = *
port = PORT_D
tls_sni = fred
hosts_require_tls = *
+ tls_try_verify_hosts = :
send_to_server2:
driver = smtp
send_to_server2:
driver = smtp
@@
-81,6
+76,7
@@
send_to_server2:
port = PORT_D
tls_sni = bill
hosts_require_tls = *
port = PORT_D
tls_sni = bill
hosts_require_tls = *
+ tls_try_verify_hosts = :
# ----- Retry -----
# ----- Retry -----