diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | ssh.1 | 30 |
2 files changed, 16 insertions, 23 deletions
@@ -1,3 +1,10 @@ | |||
1 | 20060114 | ||
2 | - (djm) OpenBSD CVS Sync | ||
3 | - jmc@cvs.openbsd.org 2006/01/06 13:27:32 | ||
4 | [ssh.1] | ||
5 | weed out some duplicate info in the known_hosts FILES entries; | ||
6 | ok djm | ||
7 | |||
1 | 20060109 | 8 | 20060109 |
2 | - (dtucker) [contrib/cygwin/ssh-host-config] Make sshd service depend on | 9 | - (dtucker) [contrib/cygwin/ssh-host-config] Make sshd service depend on |
3 | tcpip service so it's always started after IP is up. Patch from | 10 | tcpip service so it's always started after IP is up. Patch from |
@@ -3674,4 +3681,4 @@ | |||
3674 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3681 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3675 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3682 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3676 | 3683 | ||
3677 | $Id: ChangeLog,v 1.4083 2006/01/09 13:02:44 dtucker Exp $ | 3684 | $Id: ChangeLog,v 1.4084 2006/01/13 23:08:36 djm Exp $ |
@@ -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.1,v 1.243 2006/01/04 19:50:09 jmc Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.244 2006/01/06 13:27:32 jmc Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -1120,11 +1120,11 @@ never used automatically and are not necessary: they are only provided for | |||
1120 | the convenience of the user. | 1120 | the convenience of the user. |
1121 | .Pp | 1121 | .Pp |
1122 | .It ~/.ssh/known_hosts | 1122 | .It ~/.ssh/known_hosts |
1123 | Records host keys for all hosts the user has logged into that are not | 1123 | Contains a list of host keys for all hosts the user has logged into |
1124 | in | 1124 | that are not already in the systemwide list of known host keys. |
1125 | .Pa /etc/ssh/ssh_known_hosts . | ||
1126 | See | 1125 | See |
1127 | .Xr sshd 8 . | 1126 | .Xr sshd 8 |
1127 | for further details of the format of this file. | ||
1128 | .Pp | 1128 | .Pp |
1129 | .It ~/.ssh/rc | 1129 | .It ~/.ssh/rc |
1130 | Commands in this file are executed by | 1130 | Commands in this file are executed by |
@@ -1181,24 +1181,10 @@ Systemwide list of known host keys. | |||
1181 | This file should be prepared by the | 1181 | This file should be prepared by the |
1182 | system administrator to contain the public host keys of all machines in the | 1182 | system administrator to contain the public host keys of all machines in the |
1183 | organization. | 1183 | organization. |
1184 | This file should be world-readable. | 1184 | It should be world-readable. |
1185 | This file contains | 1185 | See |
1186 | public keys, one per line, in the following format (fields separated | ||
1187 | by spaces): system name, public key and optional comment field. | ||
1188 | When different names are used | ||
1189 | for the same machine, all such names should be listed, separated by | ||
1190 | commas. | ||
1191 | The format is described in the | ||
1192 | .Xr sshd 8 | ||
1193 | manual page. | ||
1194 | .Pp | ||
1195 | The canonical system name (as returned by name servers) is used by | ||
1196 | .Xr sshd 8 | 1186 | .Xr sshd 8 |
1197 | to verify the client host when logging in; other names are needed because | 1187 | for further details of the format of this file. |
1198 | .Nm | ||
1199 | does not convert the user-supplied name to a canonical name before | ||
1200 | checking the key, because someone with access to the name servers | ||
1201 | would then be able to fool host authentication. | ||
1202 | .Pp | 1188 | .Pp |
1203 | .It /etc/ssh/sshrc | 1189 | .It /etc/ssh/sshrc |
1204 | Commands in this file are executed by | 1190 | Commands in this file are executed by |