summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2013-07-12 05:42:04 +0000
committerDamien Miller <djm@cvs.openbsd.org>2013-07-12 05:42:04 +0000
commit38331c8a10aeef2d6c4156601abaccf85de49b60 (patch)
tree47ef9011cc9b64fdc068d80e82bcb22d966a8b5a
parentc2f4bafec1c6b5eb4aa6a7d218ec147ba8abe613 (diff)
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--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;