summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2021-06-15 19:27:04 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2021-06-15 20:34:28 +0100
commit2f8e0a5f6bc17ccd0749c0dc28f5da28da5d25a2 (patch)
tree317d43b87c1e1e9f4ca315e5680bd10a18e158a2 /doc
parentb9a2d0dd658cab56e0d1365e1c6a7c5ce9473bcf (diff)
downloadexim4-2f8e0a5f6bc17ccd0749c0dc28f5da28da5d25a2.tar.gz
hosts_require_helo
Diffstat (limited to 'doc')
-rw-r--r--doc/doc-docbook/spec.xfpt5
-rw-r--r--doc/doc-txt/NewStuff2
-rw-r--r--doc/doc-txt/OptionLists.txt1
3 files changed, 8 insertions, 0 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index b462f6758..0915da3e6 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -25641,6 +25641,11 @@ There will be no fallback to in-clear communication.
See the &%dnssec_request_domains%& router and transport options.
See section &<<SECDANE>>&.
+.option hosts_require_helo smtp "host list&!!" *
+.cindex "HELO/EHLO" requiring
+Exim will require an accepted HELO or EHLO command from a host matching
+this list, before accepting a MAIL command.
+
.option hosts_require_ocsp smtp "host list&!!" unset
.cindex "TLS" "requiring for certain servers"
Exim will request, and check for a valid Certificate Status being given, on a
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index c5a70da53..46a69c1d7 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -54,6 +54,8 @@ Version 4.95
15. Main option "smtp_backlog_monitor", to set a level abve which listen
socket backlogs are logged.
+16. Main option "hosts_require_helo", requiring HELO or EHLO before MAIL.
+
Version 4.94
------------
diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index 2f3435f12..d7362efbe 100644
--- a/doc/doc-txt/OptionLists.txt
+++ b/doc/doc-txt/OptionLists.txt
@@ -314,6 +314,7 @@ hosts_randomize boolean false manualroute
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_helo host list "*" main 4.95
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