- grunk@cvs.openbsd.org 2008/07/25 06:56:35

     [ssh_config]
     Add VisualHostKey to example file, ok djm@

2 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3b4cde0d..c95a93c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+20081103
+ - OpenBSD CVS Sync
+   - sthen@cvs.openbsd.org 2008/07/24 23:55:30
+     [ssh-keygen.1]
+     Add "ssh-keygen -F -l" to synopsis (displays fingerprint from
+     known_hosts).  ok djm@
+   - grunk@cvs.openbsd.org 2008/07/25 06:56:35
+     [ssh_config]
+     Add VisualHostKey to example file, ok djm@
+
 20080906
  - (dtucker) [config.guess config.sub] Update to latest versions from
    http://git.savannah.gnu.org/gitweb/ (2008-04-14 and 2008-06-16
@@ -4731,4 +4741,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.5099 2008/09/06 08:20:57 dtucker Exp $
+$Id: ChangeLog,v 1.5100 2008/11/03 08:15:44 djm Exp $
diff --git a/ssh_config b/ssh_config
index 8cb0698a..ef5a73f7 100644
--- a/ssh_config
+++ b/ssh_config
@@ -1,4 +1,4 @@
-#	$OpenBSD: ssh_config,v 1.23 2007/06/08 04:40:40 pvalchev Exp $
+#	$OpenBSD: ssh_config,v 1.24 2008/07/25 06:56:35 grunk Exp $
 
 # This is the ssh client system-wide configuration file.  See
 # ssh_config(5) for more information.  This file provides defaults for
@@ -43,3 +43,4 @@
 #   Tunnel no
 #   TunnelDevice any:any
 #   PermitLocalCommand no
+#   VisualHostKey no