tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: deraadt noticed some inconsistency in the way we denote 

the "Hostname" and "X11UseLocalhost" keywords; this makes things consistent
(effectively reversing my commit of yesterday);

ok deraadt markus djm

OpenBSD-Commit-ID: 255c02adb29186ac91dcf47dfad7adb1b1e54667
This commit is contained in:
jmc@openbsd.org 2019-06-12 05:53:21 +00:00 committed by Damien Miller
parent d1bbfdd932
commit 76af9c5738
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ssh_config.5
View File

@ -33,8 +33,8 @@
.\" (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.294 2019/06/11 13:39:40 jmc Exp $ .\" $OpenBSD: ssh_config.5,v 1.295 2019/06/12 05:53:21 jmc Exp $
.Dd $Mdocdate: June 11 2019 $ .Dd $Mdocdate: June 12 2019 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -203,7 +203,7 @@ The criteria for the
.Cm host .Cm host
keyword are matched against the target hostname, after any substitution keyword are matched against the target hostname, after any substitution
by the by the
.Cm HostName .Cm Hostname
or or
.Cm CanonicalizeHostname .Cm CanonicalizeHostname
options. options.
@ -845,16 +845,16 @@ real host name when looking up or saving the host key
in the host key database files and when validating host certificates. in the host key database files and when validating host certificates.
This option is useful for tunneling SSH connections This option is useful for tunneling SSH connections
or for multiple servers running on a single host. or for multiple servers running on a single host.
.It Cm HostName .It Cm Hostname
Specifies the real host name to log into. Specifies the real host name to log into.
This can be used to specify nicknames or abbreviations for hosts. This can be used to specify nicknames or abbreviations for hosts.
Arguments to Arguments to
.Cm HostName .Cm Hostname
accept the tokens described in the accept the tokens described in the
.Sx TOKENS .Sx TOKENS
section. section.
Numeric IP addresses are also permitted (both on the command line and in Numeric IP addresses are also permitted (both on the command line and in
.Cm HostName .Cm Hostname
specifications). specifications).
The default is the name given on the command line. The default is the name given on the command line.
.It Cm IdentitiesOnly .It Cm IdentitiesOnly
@ -1785,7 +1785,7 @@ accepts the tokens %%, %d, %h, %i, %l, %r, and %u.
.Cm ControlPath .Cm ControlPath
accepts the tokens %%, %C, %h, %i, %L, %l, %n, %p, %r, and %u. accepts the tokens %%, %C, %h, %i, %L, %l, %n, %p, %r, and %u.
.Pp .Pp
.Cm HostName .Cm Hostname
accepts the tokens %% and %h. accepts the tokens %% and %h.
.Pp .Pp
.Cm IdentityAgent .Cm IdentityAgent

6
sshd_config.5
View File

@ -33,8 +33,8 @@
.\" (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: sshd_config.5,v 1.285 2019/05/14 12:47:17 schwarze Exp $ .\" $OpenBSD: sshd_config.5,v 1.286 2019/06/12 05:53:21 jmc Exp $
.Dd $Mdocdate: May 14 2019 $ .Dd $Mdocdate: June 12 2019 $
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -1155,7 +1155,7 @@ Available keywords are
.Cm X11DisplayOffset , .Cm X11DisplayOffset ,
.Cm X11Forwarding .Cm X11Forwarding
and and
.Cm X11UseLocalHost . .Cm X11UseLocalhost .
.It Cm MaxAuthTries .It Cm MaxAuthTries
Specifies the maximum number of authentication attempts permitted per Specifies the maximum number of authentication attempts permitted per
connection. connection.