summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-08-05 11:34:51 +1000
committerDamien Miller <djm@mindrot.org>2006-08-05 11:34:51 +1000
commit858bb7dc7c41816e0c779b1bda09324b9ea97ddf (patch)
tree6fe5e9f924cf604a9e2b6709ac87893cac2bd1a9
parente7a1e5cf630d635b253f0c0bada8c8886436297f (diff)
- jmc@cvs.openbsd.org 2006/07/27 08:00:50
[ssh_config.5] avoid confusing wording in HashKnownHosts: originally spotted by alan amesbury; ok deraadt
-rw-r--r--ChangeLog7
-rw-r--r--ssh_config.57
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b9a3ca2fb..54fa577b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,11 @@
25 [ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh.c sshconnect.c] 25 [ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh.c sshconnect.c]
26 [sshconnect1.c sshd.c xmalloc.c] 26 [sshconnect1.c sshd.c xmalloc.c]
27 move #include <stdlib.h> out of includes.h 27 move #include <stdlib.h> out of includes.h
28 - jmc@cvs.openbsd.org 2006/07/27 08:00:50
29 [ssh_config.5]
30 avoid confusing wording in HashKnownHosts:
31 originally spotted by alan amesbury;
32 ok deraadt
28 33
2920060804 3420060804
30 - (dtucker) [configure.ac] The "crippled AES" test does not work on recent 35 - (dtucker) [configure.ac] The "crippled AES" test does not work on recent
@@ -5095,4 +5100,4 @@
5095 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5100 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5096 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5101 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5097 5102
5098$Id: ChangeLog,v 1.4446 2006/08/05 01:34:19 djm Exp $ 5103$Id: ChangeLog,v 1.4447 2006/08/05 01:34:51 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 55ca55303..20c58934a 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh_config.5,v 1.96 2006/07/11 18:50:48 markus Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.97 2006/07/27 08:00:50 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -497,8 +497,9 @@ but they do not reveal identifying information should the file's contents
497be disclosed. 497be disclosed.
498The default is 498The default is
499.Dq no . 499.Dq no .
500Note that hashing of names and addresses will not be retrospectively applied 500Note that existing names and addresses in known hosts files
501to existing known hosts files, but these may be manually hashed using 501will not be converted automatically,
502but may be manually hashed using
502.Xr ssh-keygen 1 . 503.Xr ssh-keygen 1 .
503.It Cm HostbasedAuthentication 504.It Cm HostbasedAuthentication
504Specifies whether to try rhosts based authentication with public key 505Specifies whether to try rhosts based authentication with public key