mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-23 09:17:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
correct description of UpdateHostKeys in ssh_config.5 and
 add it to -o lists for ssh, scp and sftp; pointed out by jmc@
This commit is contained in:
djm@openbsd.org 2015-01-26 12:16:36 +00:00 committed by Damien Miller
parent 5104db7cbd
commit 1d1092bff8
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scp.1
View File

@ -8,9 +8,9 @@
.\"
.\" Created: Sun May 7 00:14:37 1995 ylo
.\"
.\" $OpenBSD: scp.1,v 1.63 2015/01/16 16:20:23 schwarze Exp $
.\" $OpenBSD: scp.1,v 1.64 2015/01/26 12:16:36 djm Exp $
.\"
.Dd $Mdocdate: January 16 2015 $
.Dd $Mdocdate: January 26 2015 $
.Dt SCP 1
.Os
.Sh NAME
@ -179,6 +179,7 @@ For full details of the options listed below, and their possible values, see
.It StrictHostKeyChecking
.It TCPKeepAlive
.It UsePrivilegedPort
.It UpdateHostKeys
.It User
.It UserKnownHostsFile
.It VerifyHostKeyDNS

5
sftp.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: sftp.1,v 1.99 2014/04/22 14:16:30 jmc Exp $
.\" $OpenBSD: sftp.1,v 1.100 2015/01/26 12:16:36 djm Exp $
.\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\"
@ -22,7 +22,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.
.\"
.Dd $Mdocdate: April 22 2014 $
.Dd $Mdocdate: January 26 2015 $
.Dt SFTP 1
.Os
.Sh NAME
@ -243,6 +243,7 @@ For full details of the options listed below, and their possible values, see
.It ServerAliveCountMax
.It StrictHostKeyChecking
.It TCPKeepAlive
.It UpdateHostKeys
.It UsePrivilegedPort
.It User
.It UserKnownHostsFile

5
ssh.1
View File

@ -33,8 +33,8 @@
.\" (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.1,v 1.353 2014/12/22 09:26:31 jmc Exp $
.Dd $Mdocdate: December 22 2014 $
.\" $OpenBSD: ssh.1,v 1.354 2015/01/26 12:16:36 djm Exp $
.Dd $Mdocdate: January 26 2015 $
.Dt SSH 1
.Os
.Sh NAME
@ -484,6 +484,7 @@ For full details of the options listed below, and their possible values, see
.It TCPKeepAlive
.It Tunnel
.It TunnelDevice
.It UpdateHostKeys
.It UsePrivilegedPort
.It User
.It UserKnownHostsFile

8
ssh_config.5
View File

@ -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.200 2015/01/26 03:04:45 djm Exp $
.\" $OpenBSD: ssh_config.5,v 1.201 2015/01/26 12:16:36 djm Exp $
.Dd $Mdocdate: January 26 2015 $
.Dt SSH_CONFIG 5
.Os
@ -1492,7 +1492,7 @@ is not specified, it defaults to
.Dq any .
The default is
.Dq any:any .
.It Cm UpdateHostkeys
.It Cm UpdateHostKeys
Specifies whether
.Xr ssh 1
should accept notifications of additional hostkeys from the server sent
@ -1504,8 +1504,8 @@ The argument must be
or
.Dq no .
Enabling this option allows learning alternate hostkeys for a server
and supports graceful key rotation by allowing a server to public replacement
keys before old ones are removed.
and supports graceful key rotation by allowing a server to send replacement
public keys before old ones are removed.
Additional hostkeys are only accepted if the key used to authenticate the
host was already trusted or explicity accepted by the user.
.Pp