diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-02-23 16:55:31 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-02-24 03:59:09 +1100 |
commit | e94e4b07ef2eaead38b085a60535df9981cdbcdb (patch) | |
tree | 11576adaa1955bfdf4225137b7b2524226bf8c49 | |
parent | f2293a65392b54ac721f66bc0b44462e8d1d81f8 (diff) |
upstream commit
silence a spurious error message when listing
fingerprints for known_hosts; bz#2342
-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 923874825..1ae865af7 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.262 2015/02/16 22:08:57 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.263 2015/02/23 16:55:31 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 |
@@ -843,7 +843,7 @@ do_fingerprint(struct passwd *pw) | |||
843 | exit(1); | 843 | exit(1); |
844 | } | 844 | } |
845 | if ((r = sshkey_load_public(identity_file, &public, &comment)) != 0) | 845 | if ((r = sshkey_load_public(identity_file, &public, &comment)) != 0) |
846 | error("Error loading public key \"%s\": %s", | 846 | debug("Error loading public key \"%s\": %s", |
847 | identity_file, ssh_err(r)); | 847 | identity_file, ssh_err(r)); |
848 | else { | 848 | else { |
849 | fp = sshkey_fingerprint(public, fptype, rep); | 849 | fp = sshkey_fingerprint(public, fptype, rep); |