diff options
author | jmc@openbsd.org <jmc@openbsd.org> | 2020-12-22 07:40:26 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-12-29 12:02:51 +1100 |
commit | 09d070ccc3574ae0d7947d212ed53c7268ef7e1f (patch) | |
tree | cfd8be8cdb9bcf4ff7fbb6469d544e875aa95834 /ssh_config.5 | |
parent | 931c93389a80e32272712459b1102d303844453d (diff) | |
download | openssh-git-09d070ccc3574ae0d7947d212ed53c7268ef7e1f.tar.gz |
upstream: tweak the description of KnownHostsCommand in ssh_conf.5,
and add entries for it to the -O list in scp.1 and sftp.1;
ok djm
OpenBSD-Commit-ID: aba31ebea03f38f8d218857f7ce16a500c3e4aff
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index d6d22f1d..04da0575 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -33,7 +33,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.339 2020/12/22 00:15:23 djm Exp $ +.\" $OpenBSD: ssh_config.5,v 1.340 2020/12/22 07:40:26 jmc Exp $ .Dd $Mdocdate: December 22 2020 $ .Dt SSH_CONFIG 5 .Os @@ -1121,13 +1121,13 @@ diffie-hellman-group14-sha256 The list of available key exchange algorithms may also be obtained using .Qq ssh -Q kex . .It Cm KnownHostsCommand -Specifies a command to use to obtain a list of host keys, additional to +Specifies a command to use to obtain a list of host keys, in addition to those listed in .Cm UserKnownHostsFile and .Cm GlobalKnownHostsFile . This command is executed after the files have been read. -It may write host keys lines to standard output in identical format to the +It may write host key lines to standard output in identical format to the usual files (described in the .Sx VERIFYING HOST KEYS section in @@ -1137,7 +1137,7 @@ Arguments to accept the tokens described in the .Sx TOKENS section. -The command may be invoked multiple times per connection: when preparing +The command may be invoked multiple times per connection: once when preparing the preference list of host key algorithms to use, again to obtain the host key for the requested host name and, if .Cm CheckHostIP @@ -1916,17 +1916,17 @@ The hostname or address that is being searched for. .It %h The remote hostname. -.It %I +.It \%%I A string describing the reason for a .Cm KnownHostsCommand -execution; either -.Cm "ADDRESS" +execution: either +.Cm ADDRESS when looking up a host by address (only when .Cm CheckHostIP is enabled), -.Cm "HOSTNAME" -when searching by hostname or -.Cm "ORDER" +.Cm HOSTNAME +when searching by hostname, or +.Cm ORDER when preparing the host key algorithm preference list to use for the destination host. .It %i |