summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2019-06-12 11:31:50 +0000
committerDamien Miller <djm@mindrot.org>2019-06-14 13:01:28 +1000
commit7349149da1074d82b71722338e05b6a282f126cc (patch)
tree4e5462773fa9eb96774acdbe057310e0fd2cebed
parent76af9c57387243556d38935555c227d0b34062c5 (diff)
upstream: Hostname->HostName cleanup; from lauri tirkkonen ok
dtucker OpenBSD-Commit-ID: 4ade73629ede63b691f36f9a929f943d4e7a44e4
-rw-r--r--clientloop.c4
-rw-r--r--readconf.c12
-rw-r--r--scp.16
-rw-r--r--sftp.16
-rw-r--r--ssh.16
-rw-r--r--ssh.c4
-rw-r--r--ssh_config.56
7 files changed, 22 insertions, 22 deletions
diff --git a/clientloop.c b/clientloop.c
index 755f2923..244de987 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -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;
diff --git a/readconf.c b/readconf.c
index c143fa2e..ec30ab30 100644
--- a/readconf.c
+++ b/readconf.c
@@ -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 */
diff --git a/scp.1 b/scp.1
index a2833dab..dee7fcea 100644
--- a/scp.1
+++ b/scp.1
@@ -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
diff --git a/sftp.1 b/sftp.1
index 25909588..4554ae4f 100644
--- a/sftp.1
+++ b/sftp.1
@@ -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
diff --git a/ssh.1 b/ssh.1
index 9480eba8..424d6c3e 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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
diff --git a/ssh.c b/ssh.c
index d8d61411..a9903b6f 100644
--- a/ssh.c
+++ b/ssh.c
@@ -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;
diff --git a/ssh_config.5 b/ssh_config.5
index 4e72d2ea..806676bb 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.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.