- sthen@cvs.openbsd.org 2008/07/13 21:22:52

     [ssh-keygen.c]
     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@

2 files changed, 15 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index a3b7eb02d..6171fe111 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+20080714
+ - (djm) OpenBSD CVS Sync
+   - sthen@cvs.openbsd.org 2008/07/13 21:22:52
+     [ssh-keygen.c]
+     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@
+
 20080712
  - (djm) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2008/07/12 04:52:50
@@ -4633,4 +4642,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5075 2008/07/12 07:12:49 djm Exp $
+$Id: ChangeLog,v 1.5076 2008/07/14 01:28:29 djm Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index eca758c6e..f7e284062 100644
--- a/ssh-keygen.c
+++ b/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
@@ -620,8 +620,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 {