On Wed, Jun 12, 2019 at 12:55:01PM +0300, Lauri Tirkkonen wrote:
> On Tue, Jun 11 2019 14:40:03 +0100, Jason McIntyre wrote:
> > On Tue, Jun 11, 2019 at 03:11:03PM +0300, Lauri Tirkkonen wrote:
> > > Hi, trivial manpage diff.
> > >
> >
> > fixed, thanks.
> > jmc
>
> I noticed the followup commit that changes the canonical option name to
> 'Hostname'. I also like that capitalization better, but your diff seems
> to have been a bit incomplete; in particular the option should be called
> oHostname in code also, and a couple manpage mentions of HostName still
> remain. X11UseLocalhost is used consistently in comparison.
>
ouch. thanks for following this up. i've just committed your diff.
jmc
> diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c
> index fdcca0e25ed..fd43ee4cbb4 100644
> --- a/usr.bin/ssh/clientloop.c
> +++ b/usr.bin/ssh/clientloop.c
> @@ -121,7 +121,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/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c
> index 27638663b78..5b9c97b7c8d 100644
> --- a/usr.bin/ssh/readconf.c
> +++ b/usr.bin/ssh/readconf.c
> @@ -71,7 +71,7 @@
> User foo
>
> Host fake.com
> - HostName another.host.name.real.org
> + Hostname another.host.name.real.org
> User blaah
> Port 34289
> ForwardX11 no
> @@ -133,7 +133,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,
> @@ -225,7 +225,7 @@ static struct {
> { "certificatefile", oCertificateFile },
> { "addkeystoagent", oAddKeysToAgent },
> { "identityagent", oIdentityAgent },
> - { "hostname", oHostName },
> + { "hostname", oHostname },
> { "hostkeyalias", oHostKeyAlias },
> { "proxycommand", oProxyCommand },
> { "port", oPort },
> @@ -1102,7 +1102,7 @@ parse_char_array:
> max_entries = SSH_MAX_HOSTS_FILES;
> goto parse_char_array;
>
> - case oHostName:
> + case oHostname:
> charptr = &options->hostname;
> goto parse_string;
>
> @@ -2576,7 +2576,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/usr.bin/ssh/scp.1 b/usr.bin/ssh/scp.1
> index a2833dab041..29e97808ed1 100644
> --- a/usr.bin/ssh/scp.1
> +++ b/usr.bin/ssh/scp.1
> @@ -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/usr.bin/ssh/sftp.1 b/usr.bin/ssh/sftp.1
> index 259095885a7..a6757705941 100644
> --- a/usr.bin/ssh/sftp.1
> +++ b/usr.bin/ssh/sftp.1
> @@ -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/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
> index 9480eba8d3e..4c2c101d765 100644
> --- a/usr.bin/ssh/ssh.1
> +++ b/usr.bin/ssh/ssh.1
> @@ -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/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
> index defa3c1c337..aeefbe4f91c 100644
> --- a/usr.bin/ssh/ssh.c
> +++ b/usr.bin/ssh/ssh.c
> @@ -146,7 +146,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/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
> index 7bb6cde7ae1..719288b03a5 100644
> --- a/usr.bin/ssh/ssh_config.5
> +++ b/usr.bin/ssh/ssh_config.5
> @@ -1223,8 +1223,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.
>
> --
> Lauri Tirkkonen | lotheac @ IRCnet
>
