Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/crypto/external/bsd/openssh/dist CID 1293644: Check returns



details:   https://anonhg.NetBSD.org/src/rev/f86521a42a74
branches:  trunk
changeset: 807533:f86521a42a74
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Apr 13 17:54:52 2015 +0000

description:
CID 1293644: Check returns

diffstat:

 crypto/external/bsd/openssh/dist/ssh-keyscan.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 212793c90833 -r f86521a42a74 crypto/external/bsd/openssh/dist/ssh-keyscan.c
--- a/crypto/external/bsd/openssh/dist/ssh-keyscan.c    Mon Apr 13 17:50:31 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/ssh-keyscan.c    Mon Apr 13 17:54:52 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ssh-keyscan.c,v 1.12 2015/04/04 13:59:20 christos Exp $        */
+/*     $NetBSD: ssh-keyscan.c,v 1.13 2015/04/13 17:54:52 christos Exp $        */
 /* $OpenBSD: ssh-keyscan.c,v 1.99 2015/01/30 10:44:49 djm Exp $ */
 /*
  * Copyright 1995, 1996 by David Mazieres <dm%lcs.mit.edu@localhost>.
@@ -9,7 +9,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: ssh-keyscan.c,v 1.12 2015/04/04 13:59:20 christos Exp $");
+__RCSID("$NetBSD: ssh-keyscan.c,v 1.13 2015/04/13 17:54:52 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -284,6 +284,7 @@
 keyprint(con *c, struct sshkey *key)
 {
        char *host = c->c_output_name ? c->c_output_name : c->c_name;
+       int r;
 
        if (!key)
                return;
@@ -291,7 +292,9 @@
                fatal("host_hash failed");
 
        fprintf(stdout, "%s ", host);
-       sshkey_write(key, stdout);
+       if ((r = sshkey_write(key, stdout)) != 0)
+               fprintf(stderr, "key_write failed: %s", ssh_err(r));
+
        fputs("\n", stdout);
 }
 



Home | Main Index | Thread Index | Old Index