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 d133792..30e02b8 100644 (file)
--- 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;