summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-11-03 19:15:44 +1100
committerDamien Miller <djm@mindrot.org>2008-11-03 19:15:44 +1100
commit9f6fb56ab83da2e795e4a8eb863992701fd83516 (patch)
tree3058f342993c91ac67b47b76a72a6e285b8bf6ff
parent718ed5040196266d623a98aa61873bb50a7bf564 (diff)
- grunk@cvs.openbsd.org 2008/07/25 06:56:35
[ssh_config] Add VisualHostKey to example file, ok djm@
-rw-r--r--ChangeLog12
-rw-r--r--ssh_config3
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b4cde0d6..c95a93c6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
120081103
2 - OpenBSD CVS Sync
3 - sthen@cvs.openbsd.org 2008/07/24 23:55:30
4 [ssh-keygen.1]
5 Add "ssh-keygen -F -l" to synopsis (displays fingerprint from
6 known_hosts). ok djm@
7 - grunk@cvs.openbsd.org 2008/07/25 06:56:35
8 [ssh_config]
9 Add VisualHostKey to example file, ok djm@
10
120080906 1120080906
2 - (dtucker) [config.guess config.sub] Update to latest versions from 12 - (dtucker) [config.guess config.sub] Update to latest versions from
3 http://git.savannah.gnu.org/gitweb/ (2008-04-14 and 2008-06-16 13 http://git.savannah.gnu.org/gitweb/ (2008-04-14 and 2008-06-16
@@ -4731,4 +4741,4 @@
4731 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4741 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4732 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4742 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4733 4743
4734$Id: ChangeLog,v 1.5099 2008/09/06 08:20:57 dtucker Exp $ 4744$Id: ChangeLog,v 1.5100 2008/11/03 08:15:44 djm Exp $
diff --git a/ssh_config b/ssh_config
index 8cb0698a8..ef5a73f7d 100644
--- a/ssh_config
+++ b/ssh_config
@@ -1,4 +1,4 @@
1# $OpenBSD: ssh_config,v 1.23 2007/06/08 04:40:40 pvalchev Exp $ 1# $OpenBSD: ssh_config,v 1.24 2008/07/25 06:56:35 grunk Exp $
2 2
3# This is the ssh client system-wide configuration file. See 3# This is the ssh client system-wide configuration file. See
4# ssh_config(5) for more information. This file provides defaults for 4# ssh_config(5) for more information. This file provides defaults for
@@ -43,3 +43,4 @@
43# Tunnel no 43# Tunnel no
44# TunnelDevice any:any 44# TunnelDevice any:any
45# PermitLocalCommand no 45# PermitLocalCommand no
46# VisualHostKey no