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: Hostname->HostName cleanup; from lauri tirkkonen ok 

dtucker

OpenBSD-Commit-ID: 4ade73629ede63b691f36f9a929f943d4e7a44e4
This commit is contained in:
jmc@openbsd.org 2019-06-12 11:31:50 +00:00 committed by Damien Miller
parent 76af9c5738
commit 7349149da1
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clientloop.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: clientloop.c,v 1.323 2019/04/23 11:56:41 dtucker Exp $ */
/* $OpenBSD: clientloop.c,v 1.324 2019/06/12 11:31:50 jmc Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -129,7 +129,7 @@ extern int muxserver_sock; /* XXX use mux_client_cleanup() instead */
/*
* Name of the host we are connecting to. This is the name given on the
* command line, or the HostName specified for the user-supplied name in a
* command line, or the Hostname specified for the user-supplied name in a
* configuration file.
*/
extern char *host;

12
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.305 2019/06/07 14:18:48 dtucker Exp $ */
/* $OpenBSD: readconf.c,v 1.306 2019/06/12 11:31:50 jmc Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -86,7 +86,7 @@
User foo
Host fake.com
HostName another.host.name.real.org
Hostname another.host.name.real.org
User blaah
Port 34289
ForwardX11 no
@ -148,7 +148,7 @@ typedef enum {
oGatewayPorts, oExitOnForwardFailure,
oPasswordAuthentication, oRSAAuthentication,
oChallengeResponseAuthentication, oXAuthLocation,
oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,
oIdentityFile, oHostname, oPort, oCipher, oRemoteForward, oLocalForward,
oCertificateFile, oAddKeysToAgent, oIdentityAgent,
oUser, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,
oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,
@ -240,7 +240,7 @@ static struct {
{ "certificatefile", oCertificateFile },
{ "addkeystoagent", oAddKeysToAgent },
{ "identityagent", oIdentityAgent },
{ "hostname", oHostName },
{ "hostname", oHostname },
{ "hostkeyalias", oHostKeyAlias },
{ "proxycommand", oProxyCommand },
{ "port", oPort },
@ -1117,7 +1117,7 @@ parse_char_array:
max_entries = SSH_MAX_HOSTS_FILES;
goto parse_char_array;
case oHostName:
case oHostname:
charptr = &options->hostname;
goto parse_string;
@ -2593,7 +2593,7 @@ dump_client_config(Options *o, const char *host)
/* Most interesting options first: user, host, port */
dump_cfg_string(oUser, o->user);
dump_cfg_string(oHostName, host);
dump_cfg_string(oHostname, host);
dump_cfg_int(oPort, o->port);
/* Flag options */

6
scp.1
View File

@ -8,9 +8,9 @@
.\"
.\" Created: Sun May 7 00:14:37 1995 ylo
.\"
.\" $OpenBSD: scp.1,v 1.85 2019/01/26 22:41:28 djm Exp $
.\" $OpenBSD: scp.1,v 1.86 2019/06/12 11:31:50 jmc Exp $
.\"
.Dd $Mdocdate: January 26 2019 $
.Dd $Mdocdate: June 12 2019 $
.Dt SCP 1
.Os
.Sh NAME
@ -164,7 +164,7 @@ For full details of the options listed below, and their possible values, see
.It HostbasedKeyTypes
.It HostKeyAlgorithms
.It HostKeyAlias
.It HostName
.It Hostname
.It IdentitiesOnly
.It IdentityAgent
.It IdentityFile

6
sftp.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: sftp.1,v 1.125 2019/01/22 06:58:31 jmc Exp $
.\" $OpenBSD: sftp.1,v 1.126 2019/06/12 11:31:50 jmc 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: January 22 2019 $
.Dd $Mdocdate: June 12 2019 $
.Dt SFTP 1
.Os
.Sh NAME
@ -241,7 +241,7 @@ For full details of the options listed below, and their possible values, see
.It HostbasedKeyTypes
.It HostKeyAlgorithms
.It HostKeyAlias
.It HostName
.It Hostname
.It IdentitiesOnly
.It IdentityAgent
.It IdentityFile

6
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.402 2019/03/16 19:14:21 jmc Exp $
.Dd $Mdocdate: March 16 2019 $
.\" $OpenBSD: ssh.1,v 1.403 2019/06/12 11:31:50 jmc Exp $
.Dd $Mdocdate: June 12 2019 $
.Dt SSH 1
.Os
.Sh NAME
@ -504,7 +504,7 @@ For full details of the options listed below, and their possible values, see
.It HostbasedKeyTypes
.It HostKeyAlgorithms
.It HostKeyAlias
.It HostName
.It Hostname
.It IdentitiesOnly
.It IdentityAgent
.It IdentityFile

4
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.502 2019/06/06 05:13:13 otto Exp $ */
/* $OpenBSD: ssh.c,v 1.503 2019/06/12 11:31:50 jmc Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -162,7 +162,7 @@ char *config = NULL;
/*
* Name of the host we are connecting to. This is the name given on the
* command line, or the HostName specified for the user-supplied name in a
* command line, or the Hostname specified for the user-supplied name in a
* configuration file.
*/
char *host;

6
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.295 2019/06/12 05:53:21 jmc Exp $
.\" $OpenBSD: ssh_config.5,v 1.296 2019/06/12 11:31:50 jmc Exp $
.Dd $Mdocdate: June 12 2019 $
.Dt SSH_CONFIG 5
.Os
@ -1222,8 +1222,8 @@ server running on some machine, or execute
.Ic sshd -i
somewhere.
Host key management will be done using the
HostName of the host being connected (defaulting to the name typed by
the user).
.Cm Hostname
of the host being connected (defaulting to the name typed by the user).
Setting the command to
.Cm none
disables this option entirely.