upstream commit

further silence spurious error message even when -v is
 specified (e.g. to get visual host keys); reported by naddy@
This commit is contained in:
djm@openbsd.org 2015-02-23 22:21:21 +00:00 committed by Damien Miller
parent 9af21979c0
commit 2285c30d51
1 changed files with 2 additions and 2 deletions

View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.263 2015/02/23 16:55:31 djm Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.264 2015/02/23 22:21:21 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -843,7 +843,7 @@ do_fingerprint(struct passwd *pw)
exit(1); exit(1);
} }
if ((r = sshkey_load_public(identity_file, &public, &comment)) != 0) if ((r = sshkey_load_public(identity_file, &public, &comment)) != 0)
debug("Error loading public key \"%s\": %s", debug2("Error loading public key \"%s\": %s",
identity_file, ssh_err(r)); identity_file, ssh_err(r));
else { else {
fp = sshkey_fingerprint(public, fptype, rep); fp = sshkey_fingerprint(public, fptype, rep);