Attachment 2735 Details for Bug 2479 – expand each host name/address individually

[patch] expand each host name/address individually

bz2479.diff (text/plain), 1003 bytes, created by Damien Miller on 2015-10-23 13:36:13 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2015-10-23 13:36:13 AEDT

Size: 1003 bytes

patch

obsolete

>diff --git a/ssh-keyscan.c b/ssh-keyscan.c
>index 57d8842..1be4eaf 100644
>--- a/ssh-keyscan.c
>+++ b/ssh-keyscan.c
>@@ -296,13 +296,10 @@ keygrab_ssh2(con *c)
> }
> 
> static void
>-keyprint(con *c, struct sshkey *key)
>+keyprint_one(char *host, struct sshkey *key)
> {
>-	char *host = c->c_output_name ? c->c_output_name : c->c_name;
>-	char *hostport = NULL;
>+	char *hostport;
> 
>-	if (!key)
>-		return;
> 	if (hash_hosts && (host = host_hash(host, NULL, 0)) == NULL)
> 		fatal("host_hash failed");
> 
>@@ -313,6 +310,24 @@ keyprint(con *c, struct sshkey *key)
> 	free(hostport);
> }
> 
>+static void
>+keyprint(con *c, struct sshkey *key)
>+{
>+	char *hosts = c->c_output_name ? c->c_output_name : c->c_name;
>+	char *host, *ohosts;
>+
>+	if (!key)
>+		return;
>+	if (!hash_hosts && ssh_port == SSH_DEFAULT_PORT) {
>+		keyprint_one(hosts, key);
>+		return;
>+	}
>+	ohosts = hosts = xstrdup(hosts);
>+	while ((host = strsep(&hosts, ",")) != NULL)
>+		keyprint_one(host, key);
>+	free(ohosts);
>+}
>+
> static int
> tcpconnect(char *host)
> {

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 2479: 2735