diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-01-16 15:55:07 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-01-20 00:18:44 +1100 |
commit | bb8b442d32dbdb8521d610e10d8b248d938bd747 (patch) | |
tree | 265821cfe7885226ae227d77e2da91997b4afc7f | |
parent | 9010902954a40b59d0bf3df3ccbc3140a653e2bc (diff) |
upstream commit
regression: incorrect error message on
otherwise-successful ssh-keygen -A. Reported by Dmitry Orlov, via deraadt@
-rw-r--r-- | ssh-keygen.c | 6 |
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 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.253 2015/01/16 06:40:12 deraadt Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.254 2015/01/16 15:55:07 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1009,8 +1009,8 @@ do_gen_all_hostkeys(struct passwd *pw) | |||
1009 | first = 0; | 1009 | first = 0; |
1010 | continue; | 1010 | continue; |
1011 | } | 1011 | } |
1012 | if (!sshkey_write(public, f)) { | 1012 | if ((r = sshkey_write(public, f)) != 0) { |
1013 | fprintf(stderr, "write key failed\n"); | 1013 | fprintf(stderr, "write key failed: %s\n", ssh_err(r)); |
1014 | fclose(f); | 1014 | fclose(f); |
1015 | sshkey_free(public); | 1015 | sshkey_free(public); |
1016 | first = 0; | 1016 | first = 0; |