diff options
author | Damien Miller <djm@mindrot.org> | 2013-07-18 16:13:37 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-07-18 16:13:37 +1000 |
commit | 5bb8833e809d827496dffca0dc2c223052c93931 (patch) | |
tree | 1ba85cb9cc85909ceaa801fc68dcca5f4a41e668 /ssh-keygen.c | |
parent | 7313fc9222785d0c54a7ffcaf2067f4db02c8d72 (diff) |
- djm@cvs.openbsd.org 2013/07/12 05:42:03
[ssh-keygen.c]
do_print_resource_record() can never be called with a NULL filename, so
don't attempt (and bungle) asking for one if it has not been specified
bz#2127 ok dtucker@
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 504ebaf7b..1edc965d5 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.228 2013/07/12 00:20:00 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.229 2013/07/12 05:42:03 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 |
@@ -1301,7 +1301,7 @@ do_print_resource_record(struct passwd *pw, char *fname, char *hname) | |||
1301 | struct stat st; | 1301 | struct stat st; |
1302 | 1302 | ||
1303 | if (fname == NULL) | 1303 | if (fname == NULL) |
1304 | ask_filename(pw, "Enter file in which the key is"); | 1304 | fatal("%s: no filename", __func__); |
1305 | if (stat(fname, &st) < 0) { | 1305 | if (stat(fname, &st) < 0) { |
1306 | if (errno == ENOENT) | 1306 | if (errno == ENOENT) |
1307 | return 0; | 1307 | return 0; |