diff options
author | jmc@openbsd.org <jmc@openbsd.org> | 2019-06-12 11:31:50 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-06-14 13:01:28 +1000 |
commit | 7349149da1074d82b71722338e05b6a282f126cc (patch) | |
tree | 4e5462773fa9eb96774acdbe057310e0fd2cebed /readconf.c | |
parent | 76af9c57387243556d38935555c227d0b34062c5 (diff) |
upstream: Hostname->HostName cleanup; from lauri tirkkonen ok
dtucker
OpenBSD-Commit-ID: 4ade73629ede63b691f36f9a929f943d4e7a44e4
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 12 |
1 files changed, 6 insertions, 6 deletions
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 */ |