summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2015-01-16 15:55:07 +0000
committerdjm <djm@openbsd.org>2015-01-16 15:55:07 +0000
commit99076f2018d4483c7368132ac79366a89800574f (patch)
tree2b87ea32764b2ce72b2d4bd124c672b013990aca
parentfix placement of opening parentheses, and drop some .Xo while here (diff)
downloadwireguard-openbsd-99076f2018d4483c7368132ac79366a89800574f.tar.xz
wireguard-openbsd-99076f2018d4483c7368132ac79366a89800574f.zip
regression: incorrect error message on otherwise-successful
ssh-keygen -A. Reported by Dmitry Orlov, via deraadt@
-rw-r--r--usr.bin/ssh/ssh-keygen.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index d1337927b4b..30e02b8e26c 100644
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.253 2015/01/16 06:40:12 deraadt Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.254 2015/01/16 15:55:07 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -991,8 +991,8 @@ do_gen_all_hostkeys(struct passwd *pw)
first = 0;
continue;
}
- if (!sshkey_write(public, f)) {
- fprintf(stderr, "write key failed\n");
+ if ((r = sshkey_write(public, f)) != 0) {
+ fprintf(stderr, "write key failed: %s\n", ssh_err(r));
fclose(f);
sshkey_free(public);
first = 0;