summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2019-11-18 11:03:15 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2019-11-18 11:04:19 +0000
commitda40b1ec6b91ccd3faa4def9e5cff05ec51ca573 (patch)
treeafd6cf4fab9b69af24fe554c5c03023b9aa04dc2 /doc
parent84b1b2779773e86c221ac0641b9d7c107c5594a5 (diff)
TLS: restore TLS protocol version to default Received: header
Broken-by: f1be21cf0b
Diffstat (limited to 'doc')
-rw-r--r--doc/doc-docbook/spec.xfpt14
-rw-r--r--doc/doc-txt/NewStuff2
2 files changed, 16 insertions, 0 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index ceb377b0a..24ed4fb89 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -13522,6 +13522,19 @@ the transport.
.vindex &$tls_out_tlsa_usage$&
Bitfield of TLSA record types found. See section &<<SECDANE>>&.
+.new
+.vitem &$tls_in_ver$&
+.vindex "&$tls_in_ver$&"
+When a message is received from a remote host over an encrypted SMTP connection
+this variable is set to the protocol version, eg &'TLS1.2'&.
+
+.vitem &$tls_out_ver$&
+.vindex "&$tls_out_ver$&"
+When a message is being delivered to a remote host over an encrypted SMTP connection
+this variable is set to the protocol version.
+.wen
+
+
.vitem &$tod_bsdinbox$&
.vindex "&$tod_bsdinbox$&"
The time of day and the date, in the format required for BSD-style mailbox
@@ -16756,6 +16769,7 @@ received_header_text = Received: \
${if def:sender_helo_name {(helo=$sender_helo_name)\n\t}}}}\
by $primary_hostname \
${if def:received_protocol {with $received_protocol }}\
+ ${if def:tls_ver { ($tls_ver)}}\
${if def:tls_in_cipher_std { tls $tls_in_cipher_std\n\t}}\
(Exim $version_number)\n\t\
${if def:sender_address \
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 5d0c8bd31..fc307a3ba 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -50,6 +50,8 @@ Version 4.93
16: Command-line option to move messages from one named queue to another.
+17. Variables $tls_in_ver, $tls_out_ver.
+
Version 4.92
--------------