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 755f29231..244de9871 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: clientloop.c,v 1.323 2019/04/23 11:56:41 dtucker Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.324 2019/06/12 11:31:50 jmc Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * 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 */
129 129
130/* 130/*
131 * Name of the host we are connecting to. This is the name given on the 131 * Name of the host we are connecting to. This is the name given on the
132 * command line, or the HostName specified for the user-supplied name in a 132 * command line, or the Hostname specified for the user-supplied name in a
133 * configuration file. 133 * configuration file.
134 */ 134 */
135extern char *host; 135extern char *host;
diff --git a/readconf.c b/readconf.c
index c143fa2e2..ec30ab30a 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.c,v 1.305 2019/06/07 14:18:48 dtucker Exp $ */ 1/* $OpenBSD: readconf.c,v 1.306 2019/06/12 11:31:50 jmc Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -86,7 +86,7 @@
86 User foo 86 User foo
87 87
88 Host fake.com 88 Host fake.com
89 HostName another.host.name.real.org 89 Hostname another.host.name.real.org
90 User blaah 90 User blaah
91 Port 34289 91 Port 34289
92 ForwardX11 no 92 ForwardX11 no
@@ -148,7 +148,7 @@ typedef enum {
148 oGatewayPorts, oExitOnForwardFailure, 148 oGatewayPorts, oExitOnForwardFailure,
149 oPasswordAuthentication, oRSAAuthentication, 149 oPasswordAuthentication, oRSAAuthentication,
150 oChallengeResponseAuthentication, oXAuthLocation, 150 oChallengeResponseAuthentication, oXAuthLocation,
151 oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward, 151 oIdentityFile, oHostname, oPort, oCipher, oRemoteForward, oLocalForward,
152 oCertificateFile, oAddKeysToAgent, oIdentityAgent, 152 oCertificateFile, oAddKeysToAgent, oIdentityAgent,
153 oUser, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand, 153 oUser, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,
154 oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts, 154 oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,
@@ -240,7 +240,7 @@ static struct {
240 { "certificatefile", oCertificateFile }, 240 { "certificatefile", oCertificateFile },
241 { "addkeystoagent", oAddKeysToAgent }, 241 { "addkeystoagent", oAddKeysToAgent },
242 { "identityagent", oIdentityAgent }, 242 { "identityagent", oIdentityAgent },
243 { "hostname", oHostName }, 243 { "hostname", oHostname },
244 { "hostkeyalias", oHostKeyAlias }, 244 { "hostkeyalias", oHostKeyAlias },
245 { "proxycommand", oProxyCommand }, 245 { "proxycommand", oProxyCommand },
246 { "port", oPort }, 246 { "port", oPort },
@@ -1117,7 +1117,7 @@ parse_char_array:
1117 max_entries = SSH_MAX_HOSTS_FILES; 1117 max_entries = SSH_MAX_HOSTS_FILES;
1118 goto parse_char_array; 1118 goto parse_char_array;
1119 1119
1120 case oHostName: 1120 case oHostname:
1121 charptr = &options->hostname; 1121 charptr = &options->hostname;
1122 goto parse_string; 1122 goto parse_string;
1123 1123
@@ -2593,7 +2593,7 @@ dump_client_config(Options *o, const char *host)
2593 2593
2594 /* Most interesting options first: user, host, port */ 2594 /* Most interesting options first: user, host, port */
2595 dump_cfg_string(oUser, o->user); 2595 dump_cfg_string(oUser, o->user);
2596 dump_cfg_string(oHostName, host); 2596 dump_cfg_string(oHostname, host);
2597 dump_cfg_int(oPort, o->port); 2597 dump_cfg_int(oPort, o->port);
2598 2598
2599 /* Flag options */ 2599 /* Flag options */
diff --git a/scp.1 b/scp.1
index a2833dab0..dee7fcead 100644
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
8.\" 8.\"
9.\" Created: Sun May 7 00:14:37 1995 ylo 9.\" Created: Sun May 7 00:14:37 1995 ylo
10.\" 10.\"
11.\" $OpenBSD: scp.1,v 1.85 2019/01/26 22:41:28 djm Exp $ 11.\" $OpenBSD: scp.1,v 1.86 2019/06/12 11:31:50 jmc Exp $
12.\" 12.\"
13.Dd $Mdocdate: January 26 2019 $ 13.Dd $Mdocdate: June 12 2019 $
14.Dt SCP 1 14.Dt SCP 1
15.Os 15.Os
16.Sh NAME 16.Sh NAME
@@ -164,7 +164,7 @@ For full details of the options listed below, and their possible values, see
164.It HostbasedKeyTypes 164.It HostbasedKeyTypes
165.It HostKeyAlgorithms 165.It HostKeyAlgorithms
166.It HostKeyAlias 166.It HostKeyAlias
167.It HostName 167.It Hostname
168.It IdentitiesOnly 168.It IdentitiesOnly
169.It IdentityAgent 169.It IdentityAgent
170.It IdentityFile 170.It IdentityFile
diff --git a/sftp.1 b/sftp.1
index 259095885..4554ae4f3 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp.1,v 1.125 2019/01/22 06:58:31 jmc Exp $ 1.\" $OpenBSD: sftp.1,v 1.126 2019/06/12 11:31:50 jmc Exp $
2.\" 2.\"
3.\" Copyright (c) 2001 Damien Miller. All rights reserved. 3.\" Copyright (c) 2001 Damien Miller. All rights reserved.
4.\" 4.\"
@@ -22,7 +22,7 @@
22.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24.\" 24.\"
25.Dd $Mdocdate: January 22 2019 $ 25.Dd $Mdocdate: June 12 2019 $
26.Dt SFTP 1 26.Dt SFTP 1
27.Os 27.Os
28.Sh NAME 28.Sh NAME
@@ -241,7 +241,7 @@ For full details of the options listed below, and their possible values, see
241.It HostbasedKeyTypes 241.It HostbasedKeyTypes
242.It HostKeyAlgorithms 242.It HostKeyAlgorithms
243.It HostKeyAlias 243.It HostKeyAlias
244.It HostName 244.It Hostname
245.It IdentitiesOnly 245.It IdentitiesOnly
246.It IdentityAgent 246.It IdentityAgent
247.It IdentityFile 247.It IdentityFile
diff --git a/ssh.1 b/ssh.1
index 9480eba8d..424d6c3e8 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh.1,v 1.402 2019/03/16 19:14:21 jmc Exp $ 36.\" $OpenBSD: ssh.1,v 1.403 2019/06/12 11:31:50 jmc Exp $
37.Dd $Mdocdate: March 16 2019 $ 37.Dd $Mdocdate: June 12 2019 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -504,7 +504,7 @@ For full details of the options listed below, and their possible values, see
504.It HostbasedKeyTypes 504.It HostbasedKeyTypes
505.It HostKeyAlgorithms 505.It HostKeyAlgorithms
506.It HostKeyAlias 506.It HostKeyAlias
507.It HostName 507.It Hostname
508.It IdentitiesOnly 508.It IdentitiesOnly
509.It IdentityAgent 509.It IdentityAgent
510.It IdentityFile 510.It IdentityFile
diff --git a/ssh.c b/ssh.c
index d8d614111..a9903b6f9 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.502 2019/06/06 05:13:13 otto Exp $ */ 1/* $OpenBSD: ssh.c,v 1.503 2019/06/12 11:31:50 jmc Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -162,7 +162,7 @@ char *config = NULL;
162 162
163/* 163/*
164 * Name of the host we are connecting to. This is the name given on the 164 * Name of the host we are connecting to. This is the name given on the
165 * command line, or the HostName specified for the user-supplied name in a 165 * command line, or the Hostname specified for the user-supplied name in a
166 * configuration file. 166 * configuration file.
167 */ 167 */
168char *host; 168char *host;
diff --git a/ssh_config.5 b/ssh_config.5
index 4e72d2ea9..806676bba 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,7 +33,7 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh_config.5,v 1.295 2019/06/12 05:53:21 jmc Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.296 2019/06/12 11:31:50 jmc Exp $
37.Dd $Mdocdate: June 12 2019 $ 37.Dd $Mdocdate: June 12 2019 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
@@ -1222,8 +1222,8 @@ server running on some machine, or execute
1222.Ic sshd -i 1222.Ic sshd -i
1223somewhere. 1223somewhere.
1224Host key management will be done using the 1224Host key management will be done using the
1225HostName of the host being connected (defaulting to the name typed by 1225.Cm Hostname
1226the user). 1226of the host being connected (defaulting to the name typed by the user).
1227Setting the command to 1227Setting the command to
1228.Cm none 1228.Cm none
1229disables this option entirely. 1229disables this option entirely.