summaryrefslogtreecommitdiff
path: root/doc/doc-txt/OptionLists.txt
diff options
context:
space:
mode:
authorPhil Pennock <pdp@exim.org>2018-03-30 22:28:20 -0400
committerPhil Pennock <pdp@exim.org>2018-03-30 22:28:20 -0400
commit5d4da40d5b25b4f4029b46246c9757b42929bd87 (patch)
tree83b07d4ad2b66aca53875ebfdfaef619ea36dfae /doc/doc-txt/OptionLists.txt
parentc3d43245c842965fed6a9153f9c6e9e8be326b7c (diff)
parentbffc2609553745d57e15942505f34cbdd3c26b7f (diff)
Merge branch 'dane_require_tls_ciphers'
New SMTP Transport option for simplified improved security for DANE.
Diffstat (limited to 'doc/doc-txt/OptionLists.txt')
-rw-r--r--doc/doc-txt/OptionLists.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index 1fe72be6b..dfb0219cb 100644
--- a/doc/doc-txt/OptionLists.txt
+++ b/doc/doc-txt/OptionLists.txt
@@ -149,12 +149,13 @@ current_directory string unset transports
daemon_smtp_ports string unset main 1.75 pluralised in 4.21
daemon_startup_retries int 9 main 4.52
daemon_startup_sleep time 30s main 4.52
+dane_require_tls_ciphers string* unset smtp 4.91
data string unset redirect 4.00
data_timeout time 5m smtp
debug_print string* unset authenticators 4.00
unset routers 4.00
unset transports 2.00
-debug_store boolean false main 4.90
+debug_store boolean false main 4.90
delay_after_cutoff boolean true smtp
delay_warning time list 24h main
delay_warning_condition string* + main 1.73
@@ -300,10 +301,12 @@ hosts_override boolean false smtp
hosts_randomize boolean false manualroute 4.00
false smtp 3.14
hosts_require_auth host list unset smtp 4.00
+hosts_require_dane host list unset smtp 4.91 (4.85 experimental)
hosts_require_ocsp host list unset smtp 4.82 if experimental_ocsp
hosts_require_tls host list unset smtp 3.20
hosts_treat_as_local domain list unset main 1.95
hosts_try_auth host list unset smtp 4.00
+hosts_try_dane host list unset smtp 4.91 (4.85 experimental)
hosts_try_fastopen host list unset smtp 4.88
hosts_try_prdr host list unset smtp 4.82 if experimental_prdr
ibase_servers string unset main 4.23