RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) OpenBSD CVS Sync 

- jmc@cvs.openbsd.org 2006/01/06 13:27:32
     [ssh.1]
     weed out some duplicate info in the known_hosts FILES entries;
     ok djm
This commit is contained in:
Damien Miller 2006-01-14 10:08:36 +11:00
parent e78c6ce8cf
commit e87eb4ce3c
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,10 @@
20060114
- (djm) OpenBSD CVS Sync
- jmc@cvs.openbsd.org 2006/01/06 13:27:32
[ssh.1]
weed out some duplicate info in the known_hosts FILES entries;
ok djm
20060109 20060109
- (dtucker) [contrib/cygwin/ssh-host-config] Make sshd service depend on - (dtucker) [contrib/cygwin/ssh-host-config] Make sshd service depend on
tcpip service so it's always started after IP is up. Patch from tcpip service so it's always started after IP is up. Patch from
@ -3674,4 +3681,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4083 2006/01/09 13:02:44 dtucker Exp $ $Id: ChangeLog,v 1.4084 2006/01/13 23:08:36 djm Exp $

30
ssh.1
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh.1,v 1.243 2006/01/04 19:50:09 jmc Exp $ .\" $OpenBSD: ssh.1,v 1.244 2006/01/06 13:27:32 jmc Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSH 1 .Dt SSH 1
.Os .Os
@ -1120,11 +1120,11 @@ never used automatically and are not necessary: they are only provided for
the convenience of the user. the convenience of the user.
.Pp .Pp
.It ~/.ssh/known_hosts .It ~/.ssh/known_hosts
Records host keys for all hosts the user has logged into that are not Contains a list of host keys for all hosts the user has logged into
in that are not already in the systemwide list of known host keys.
.Pa /etc/ssh/ssh_known_hosts .
See See
.Xr sshd 8 . .Xr sshd 8
for further details of the format of this file.
.Pp .Pp
.It ~/.ssh/rc .It ~/.ssh/rc
Commands in this file are executed by Commands in this file are executed by
@ -1181,24 +1181,10 @@ Systemwide list of known host keys.
This file should be prepared by the This file should be prepared by the
system administrator to contain the public host keys of all machines in the system administrator to contain the public host keys of all machines in the
organization. organization.
This file should be world-readable. It should be world-readable.
This file contains See
public keys, one per line, in the following format (fields separated
by spaces): system name, public key and optional comment field.
When different names are used
for the same machine, all such names should be listed, separated by
commas.
The format is described in the
.Xr sshd 8 .Xr sshd 8
manual page. for further details of the format of this file.
.Pp
The canonical system name (as returned by name servers) is used by
.Xr sshd 8
to verify the client host when logging in; other names are needed because
.Nm
does not convert the user-supplied name to a canonical name before
checking the key, because someone with access to the name servers
would then be able to fool host authentication.
.Pp .Pp
.It /etc/ssh/sshrc .It /etc/ssh/sshrc
Commands in this file are executed by Commands in this file are executed by