upstream commit

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

1 files changed, 3 insertions, 3 deletions

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 9f6106d47..22f491cd4 100644
--- a/ssh-keygen.c
+++ b/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
@@ -1009,8 +1009,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;