summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2013-07-12 05:42:03 +0000
committerdjm <djm@openbsd.org>2013-07-12 05:42:03 +0000
commit63aecdb30b15cdc4012336a948ad3af1a78af8c3 (patch)
tree6bae20457449c7c3527f399d04c49dad79dce154 /usr.bin/ssh
parentreplace fls functions with calls to the libkern versions (diff)
downloadwireguard-openbsd-63aecdb30b15cdc4012336a948ad3af1a78af8c3.tar.xz
wireguard-openbsd-63aecdb30b15cdc4012336a948ad3af1a78af8c3.zip
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 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/ssh-keygen.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index cda92121b8c..d1871110e0b 100644
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/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
@@ -1286,7 +1286,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;