summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-03-02 12:04:16 +1100
committerDamien Miller <djm@mindrot.org>2005-03-02 12:04:16 +1100
commit27e9c5125e9a8a3d7cb5086a875a00a9eb556e90 (patch)
tree825e777803cf264d1509199ac96ad8d995d2dbad
parent9a2fdbd0d6e13dd28612a351561adb6b32b94bd5 (diff)
- jmc@cvs.openbsd.org 2005/03/01 17:19:35
[scp.1 sftp.1] add HashKnownHosts to -o list; ok markus@
-rw-r--r--ChangeLog6
-rw-r--r--scp.13
-rw-r--r--sftp.13
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3165f122..538e2e3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,10 @@
- jmc@cvs.openbsd.org 2005/03/01 15:47:14
[ssh-keyscan.1 ssh-keyscan.c]
sort options and sync usage();
+ - jmc@cvs.openbsd.org 2005/03/01 17:19:35
+ [scp.1 sftp.1]
+ add HashKnownHosts to -o list;
+ ok markus@
20050301
- (djm) OpenBSD CVS sync:
@@ -2237,4 +2241,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3680 2005/03/02 01:04:01 djm Exp $
+$Id: ChangeLog,v 1.3681 2005/03/02 01:04:16 djm Exp $
diff --git a/scp.1 b/scp.1
index 30049c2b..b5191e31 100644
--- a/scp.1
+++ b/scp.1
@@ -9,7 +9,7 @@
.\"
.\" Created: Sun May 7 00:14:37 1995 ylo
.\"
-.\" $OpenBSD: scp.1,v 1.37 2004/10/07 10:10:24 djm Exp $
+.\" $OpenBSD: scp.1,v 1.38 2005/03/01 17:19:35 jmc Exp $
.\"
.Dd September 25, 1999
.Dt SCP 1
@@ -133,6 +133,7 @@ For full details of the options listed below, and their possible values, see
.It GlobalKnownHostsFile
.It GSSAPIAuthentication
.It GSSAPIDelegateCredentials
+.It HashKnownHosts
.It Host
.It HostbasedAuthentication
.It HostKeyAlgorithms
diff --git a/sftp.1 b/sftp.1
index bcd7fdf7..c89ffc30 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.60 2004/12/05 23:55:07 jaredy Exp $
+.\" $OpenBSD: sftp.1,v 1.61 2005/03/01 17:19:35 jmc Exp $
.\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\"
@@ -161,6 +161,7 @@ For full details of the options listed below, and their possible values, see
.It GlobalKnownHostsFile
.It GSSAPIAuthentication
.It GSSAPIDelegateCredentials
+.It HashKnownHosts
.It Host
.It HostbasedAuthentication
.It HostKeyAlgorithms