From: Jeremy Harris Date: Wed, 19 Feb 2020 13:19:58 +0000 (+0000) Subject: Docs: tidying X-Git-Tag: exim-4_94_RC0~76 X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/75b6e26f5ee1d313ba0d5b835e287f06b9770559 Docs: tidying --- diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 42a84db56..25abda9e5 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -20155,8 +20155,10 @@ semicolon is the default route list separator. .section "Format of one host item" "SECTformatonehostitem" -Each item in the list of hosts is either a host name or an IP address, -optionally with an attached port number. When no port is given, an IP address +Each item in the list of hosts can be either a host name or an IP address, +optionally with an attached port number, or it can be a single "+" +(see &%hosts_randomize%&). +When no port is given, an IP address is not enclosed in brackets. When a port is specified, it overrides the port specification on the transport. The port is separated from the name or address by a colon. This leads to some complications: diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c index 5c5f37d2b..13410b839 100644 --- a/src/src/transports/smtp.c +++ b/src/src/transports/smtp.c @@ -3372,8 +3372,9 @@ done: /* If continue_hostname is not null, we get here only when continuing to deliver down an existing channel. The channel was passed as the standard -input. TLS is never active on a passed channel; the previous process always -closes it down before passing the connection on. +input. TLS is never active on a passed channel; the previous process either +closes it down before passing the connection on, or inserts a TLS-proxy +process and passes on a cleartext conection. Otherwise, we have to make a connection to the remote host, and do the initial protocol exchange.