From: djm <djm@openbsd.org>
Date: Fri, 16 Jan 2015 15:55:07 +0000 (+0000)
Subject: regression: incorrect error message on otherwise-successful
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=99076f2018d4483c7368132ac79366a89800574f;p=openbsd

regression: incorrect error message on otherwise-successful
ssh-keygen -A. Reported by Dmitry Orlov, via deraadt@
---

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;