upstream: move HostbasedAcceptedAlgorithms to the right place in
alphabetical order OpenBSD-Commit-ID: d766820d33dd874d944c14b0638239adb522c7ec
This commit is contained in:
parent
e26c980778
commit
507b448a24
4
scp.1
4
scp.1
|
@ -8,7 +8,7 @@
|
||||||
.\"
|
.\"
|
||||||
.\" Created: Sun May 7 00:14:37 1995 ylo
|
.\" Created: Sun May 7 00:14:37 1995 ylo
|
||||||
.\"
|
.\"
|
||||||
.\" $OpenBSD: scp.1,v 1.94 2021/01/26 05:32:21 dtucker Exp $
|
.\" $OpenBSD: scp.1,v 1.95 2021/01/26 15:40:17 naddy Exp $
|
||||||
.\"
|
.\"
|
||||||
.Dd $Mdocdate: January 26 2021 $
|
.Dd $Mdocdate: January 26 2021 $
|
||||||
.Dt SCP 1
|
.Dt SCP 1
|
||||||
|
@ -172,8 +172,8 @@ For full details of the options listed below, and their possible values, see
|
||||||
.It GSSAPIDelegateCredentials
|
.It GSSAPIDelegateCredentials
|
||||||
.It HashKnownHosts
|
.It HashKnownHosts
|
||||||
.It Host
|
.It Host
|
||||||
.It HostbasedAuthentication
|
|
||||||
.It HostbasedAcceptedAlgorithms
|
.It HostbasedAcceptedAlgorithms
|
||||||
|
.It HostbasedAuthentication
|
||||||
.It HostKeyAlgorithms
|
.It HostKeyAlgorithms
|
||||||
.It HostKeyAlias
|
.It HostKeyAlias
|
||||||
.It Hostname
|
.It Hostname
|
||||||
|
|
4
sftp.1
4
sftp.1
|
@ -1,4 +1,4 @@
|
||||||
.\" $OpenBSD: sftp.1,v 1.135 2021/01/26 05:32:21 dtucker Exp $
|
.\" $OpenBSD: sftp.1,v 1.136 2021/01/26 15:40:17 naddy Exp $
|
||||||
.\"
|
.\"
|
||||||
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
|
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
|
||||||
.\"
|
.\"
|
||||||
|
@ -246,8 +246,8 @@ For full details of the options listed below, and their possible values, see
|
||||||
.It GSSAPIDelegateCredentials
|
.It GSSAPIDelegateCredentials
|
||||||
.It HashKnownHosts
|
.It HashKnownHosts
|
||||||
.It Host
|
.It Host
|
||||||
.It HostbasedAuthentication
|
|
||||||
.It HostbasedAcceptedAlgorithms
|
.It HostbasedAcceptedAlgorithms
|
||||||
|
.It HostbasedAuthentication
|
||||||
.It HostKeyAlgorithms
|
.It HostKeyAlgorithms
|
||||||
.It HostKeyAlias
|
.It HostKeyAlias
|
||||||
.It Hostname
|
.It Hostname
|
||||||
|
|
4
ssh.1
4
ssh.1
|
@ -33,7 +33,7 @@
|
||||||
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||||
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
.\"
|
.\"
|
||||||
.\" $OpenBSD: ssh.1,v 1.417 2021/01/26 05:32:21 dtucker Exp $
|
.\" $OpenBSD: ssh.1,v 1.418 2021/01/26 15:40:17 naddy Exp $
|
||||||
.Dd $Mdocdate: January 26 2021 $
|
.Dd $Mdocdate: January 26 2021 $
|
||||||
.Dt SSH 1
|
.Dt SSH 1
|
||||||
.Os
|
.Os
|
||||||
|
@ -509,8 +509,8 @@ For full details of the options listed below, and their possible values, see
|
||||||
.It GSSAPIDelegateCredentials
|
.It GSSAPIDelegateCredentials
|
||||||
.It HashKnownHosts
|
.It HashKnownHosts
|
||||||
.It Host
|
.It Host
|
||||||
.It HostbasedAuthentication
|
|
||||||
.It HostbasedAcceptedAlgorithms
|
.It HostbasedAcceptedAlgorithms
|
||||||
|
.It HostbasedAuthentication
|
||||||
.It HostKeyAlgorithms
|
.It HostKeyAlgorithms
|
||||||
.It HostKeyAlias
|
.It HostKeyAlias
|
||||||
.It Hostname
|
.It Hostname
|
||||||
|
|
18
ssh_config.5
18
ssh_config.5
|
@ -33,7 +33,7 @@
|
||||||
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||||
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
.\"
|
.\"
|
||||||
.\" $OpenBSD: ssh_config.5,v 1.344 2021/01/26 05:32:22 dtucker Exp $
|
.\" $OpenBSD: ssh_config.5,v 1.345 2021/01/26 15:40:17 naddy Exp $
|
||||||
.Dd $Mdocdate: January 26 2021 $
|
.Dd $Mdocdate: January 26 2021 $
|
||||||
.Dt SSH_CONFIG 5
|
.Dt SSH_CONFIG 5
|
||||||
.Os
|
.Os
|
||||||
|
@ -800,14 +800,6 @@ Note that existing names and addresses in known hosts files
|
||||||
will not be converted automatically,
|
will not be converted automatically,
|
||||||
but may be manually hashed using
|
but may be manually hashed using
|
||||||
.Xr ssh-keygen 1 .
|
.Xr ssh-keygen 1 .
|
||||||
.It Cm HostbasedAuthentication
|
|
||||||
Specifies whether to try rhosts based authentication with public key
|
|
||||||
authentication.
|
|
||||||
The argument must be
|
|
||||||
.Cm yes
|
|
||||||
or
|
|
||||||
.Cm no
|
|
||||||
(the default).
|
|
||||||
.It Cm HostbasedAcceptedAlgorithms
|
.It Cm HostbasedAcceptedAlgorithms
|
||||||
Specifies the key types that will be used for hostbased authentication
|
Specifies the key types that will be used for hostbased authentication
|
||||||
as a comma-separated list of patterns.
|
as a comma-separated list of patterns.
|
||||||
|
@ -847,6 +839,14 @@ option of
|
||||||
.Xr ssh 1
|
.Xr ssh 1
|
||||||
may be used to list supported key types.
|
may be used to list supported key types.
|
||||||
This was formerly named HostbasedKeyTypes.
|
This was formerly named HostbasedKeyTypes.
|
||||||
|
.It Cm HostbasedAuthentication
|
||||||
|
Specifies whether to try rhosts based authentication with public key
|
||||||
|
authentication.
|
||||||
|
The argument must be
|
||||||
|
.Cm yes
|
||||||
|
or
|
||||||
|
.Cm no
|
||||||
|
(the default).
|
||||||
.It Cm HostKeyAlgorithms
|
.It Cm HostKeyAlgorithms
|
||||||
Specifies the host key algorithms
|
Specifies the host key algorithms
|
||||||
that the client wants to use in order of preference.
|
that the client wants to use in order of preference.
|
||||||
|
|
Loading…
Reference in New Issue