diff options
| author |   sthen <sthen@openbsd.org> | 2008-07-13 21:22:52 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2008-07-13 21:22:52 +0000 |
| commit | 0747738fdfbba1e6abe61aead03ed753a0a0b272 (patch) | |
| tree | acdbc68695613f29a29dd1fd527c956c32a5ee7f | |
| parent | Do not specify the gateway on RTM_DELETE -- similar fix was done in the arp (diff) | |
| download | wireguard-openbsd-0747738fdfbba1e6abe61aead03ed753a0a0b272.tar.xz wireguard-openbsd-0747738fdfbba1e6abe61aead03ed753a0a0b272.zip | |
Change "ssh-keygen -F [host] -l" to not display random art unless
-v is also specified, making it consistent with the manual and other
uses of -l.
ok grunk@
| -rw-r--r-- | usr.bin/ssh/ssh-keygen.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index eb1dc1fd924..a0ba19fbe9e 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.170 2008/06/12 21:14:46 grunk Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.171 2008/07/13 21:22:52 sthen Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -612,8 +612,10 @@ print_host(FILE *f, const char *name, Key *public, int hash) rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX; fp = key_fingerprint(public, fptype, rep); ra = key_fingerprint(public, fptype, SSH_FP_RANDOMART); - printf("%u %s %s (%s)\n%s\n", key_size(public), fp, name, - key_type(public), ra); + printf("%u %s %s (%s)\n", key_size(public), fp, name, + key_type(public)); + if (log_level >= SYSLOG_LEVEL_VERBOSE) + printf("%s\n", ra); xfree(ra); xfree(fp); } else { |