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 | |
| parent | 7313fc9222785d0c54a7ffcaf2067f4db02c8d72 (diff) | |
| download | openssh-git-5bb8833e809d827496dffca0dc2c223052c93931.tar.gz | |
- 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@
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ssh-keygen.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -49,6 +49,11 @@ in ssh_gai_strerror() don't fallback to strerror for EAI_SYSTEM when errno == 0. Avoids confusing error message in some broken resolver cases. bz#2122 patch from plautrba AT redhat.com; ok dtucker + - 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@ 20130702 - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config diff --git a/ssh-keygen.c b/ssh-keygen.c index 504ebaf7..1edc965d 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.228 2013/07/12 00:20:00 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.229 2013/07/12 05:42:03 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * 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) struct stat st; if (fname == NULL) - ask_filename(pw, "Enter file in which the key is"); + fatal("%s: no filename", __func__); if (stat(fname, &st) < 0) { if (errno == ENOENT) return 0; |