mirror of git://anongit.mindrot.org/openssh.git
upstream commit
include port number if a non-default one has been specified; based on patch from Michael Handler
This commit is contained in:
parent
4492a4f222
commit
2c2cfe1a1c
|
@ -1,4 +1,4 @@
|
||||||
/* $OpenBSD: ssh-keyscan.c,v 1.100 2015/04/05 15:43:43 miod Exp $ */
|
/* $OpenBSD: ssh-keyscan.c,v 1.101 2015/04/10 00:08:55 djm Exp $ */
|
||||||
/*
|
/*
|
||||||
* Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
|
* Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
|
||||||
*
|
*
|
||||||
|
@ -299,15 +299,18 @@ static void
|
||||||
keyprint(con *c, struct sshkey *key)
|
keyprint(con *c, struct sshkey *key)
|
||||||
{
|
{
|
||||||
char *host = c->c_output_name ? c->c_output_name : c->c_name;
|
char *host = c->c_output_name ? c->c_output_name : c->c_name;
|
||||||
|
char *hostport = NULL;
|
||||||
|
|
||||||
if (!key)
|
if (!key)
|
||||||
return;
|
return;
|
||||||
if (hash_hosts && (host = host_hash(host, NULL, 0)) == NULL)
|
if (hash_hosts && (host = host_hash(host, NULL, 0)) == NULL)
|
||||||
fatal("host_hash failed");
|
fatal("host_hash failed");
|
||||||
|
|
||||||
fprintf(stdout, "%s ", host);
|
hostport = put_host_port(host, ssh_port);
|
||||||
|
fprintf(stdout, "%s ", hostport);
|
||||||
sshkey_write(key, stdout);
|
sshkey_write(key, stdout);
|
||||||
fputs("\n", stdout);
|
fputs("\n", stdout);
|
||||||
|
free(hostport);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -488,7 +491,7 @@ congreet(int s)
|
||||||
confree(s);
|
confree(s);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
fprintf(stderr, "# %s %s\n", c->c_name, chop(buf));
|
fprintf(stderr, "# %s:%d %s\n", c->c_name, ssh_port, chop(buf));
|
||||||
n = snprintf(buf, sizeof buf, "SSH-%d.%d-OpenSSH-keyscan\r\n",
|
n = snprintf(buf, sizeof buf, "SSH-%d.%d-OpenSSH-keyscan\r\n",
|
||||||
c->c_keytype == KT_RSA1? PROTOCOL_MAJOR_1 : PROTOCOL_MAJOR_2,
|
c->c_keytype == KT_RSA1? PROTOCOL_MAJOR_1 : PROTOCOL_MAJOR_2,
|
||||||
c->c_keytype == KT_RSA1? PROTOCOL_MINOR_1 : PROTOCOL_MINOR_2);
|
c->c_keytype == KT_RSA1? PROTOCOL_MINOR_1 : PROTOCOL_MINOR_2);
|
||||||
|
|
Loading…
Reference in New Issue