- 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@

diff --git a/ChangeLog b/ChangeLog
index b95a3601d29df18c4d8e910cf5353125e39b0d13..ac4004729b7d924abfebae58bc277ef6a3bddb55 100644 (file)
--- 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

diff --git a/ssh-keygen.c b/ssh-keygen.c
index eca758c6e8c720b7cfdc61b92e780cbc1be372fa..f7e28406215286c0b53221c331ab403e9acc12a8 100644 (file)
--- 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 {