summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ssh-keyscan.14
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e09a0fc83..a70a1fac1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,11 @@
10 session.c sftp-client.c sftp.c ssh-agent.1 ssh-keygen.c ssh.c ssh1.h 10 session.c sftp-client.c sftp.c ssh-agent.1 ssh-keygen.c ssh.c ssh1.h
11 sshd.c ttymodes.h] 11 sshd.c ttymodes.h]
12 spaces 12 spaces
13 - brad@cvs.openbsd.org 2004/07/12 23:34:25
14 [ssh-keyscan.1]
15 Fix incorrect macro, .I -> .Em
16 From: Eric S. Raymond <esr at thyrsus dot com>
17 ok jmc@
13 18
1420040711 1920040711
15 - (dtucker) [auth-pam.c] Check for zero from waitpid() too, which allows 20 - (dtucker) [auth-pam.c] Check for zero from waitpid() too, which allows
@@ -1516,4 +1521,4 @@
1516 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1521 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1517 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1522 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1518 1523
1519$Id: ChangeLog,v 1.3475 2004/07/17 06:12:08 dtucker Exp $ 1524$Id: ChangeLog,v 1.3476 2004/07/17 06:13:15 dtucker Exp $
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index 572751f66..9efcf5213 100644
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keyscan.1,v 1.17 2003/06/10 09:12:11 jmc Exp $ 1.\" $OpenBSD: ssh-keyscan.1,v 1.18 2004/07/12 23:34:25 brad Exp $
2.\" 2.\"
3.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 3.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
4.\" 4.\"
@@ -97,7 +97,7 @@ to use IPv6 addresses only.
97If a ssh_known_hosts file is constructed using 97If a ssh_known_hosts file is constructed using
98.Nm 98.Nm
99without verifying the keys, users will be vulnerable to 99without verifying the keys, users will be vulnerable to
100.I man in the middle 100.Em man in the middle
101attacks. 101attacks.
102On the other hand, if the security model allows such a risk, 102On the other hand, if the security model allows such a risk,
103.Nm 103.Nm