diff options
author | Damien Miller <djm@mindrot.org> | 2006-01-14 10:08:57 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-01-14 10:08:57 +1100 |
commit | 7e76e1f101cf672df9ca1822f2a04cb4289df519 (patch) | |
tree | f71aa123f356c56c5ef86e978a44602f94bdd4df | |
parent | e87eb4ce3ce4711b94a72d729352c240047f17c1 (diff) |
- jmc@cvs.openbsd.org 2006/01/06 13:29:10
[ssh.1]
final round of whacking FILES for duplicate info, and some consistency
fixes;
ok djm
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | ssh.1 | 25 |
2 files changed, 14 insertions, 18 deletions
@@ -4,6 +4,11 @@ [ssh.1] weed out some duplicate info in the known_hosts FILES entries; ok djm + - jmc@cvs.openbsd.org 2006/01/06 13:29:10 + [ssh.1] + final round of whacking FILES for duplicate info, and some consistency + fixes; + ok djm 20060109 - (dtucker) [contrib/cygwin/ssh-host-config] Make sshd service depend on @@ -3681,4 +3686,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.4084 2006/01/13 23:08:36 djm Exp $ +$Id: ChangeLog,v 1.4085 2006/01/13 23:08:57 djm Exp $ @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh.1,v 1.244 2006/01/06 13:27:32 jmc Exp $ +.\" $OpenBSD: ssh.1,v 1.245 2006/01/06 13:29:10 jmc Exp $ .Dd September 25, 1999 .Dt SSH 1 .Os @@ -1078,9 +1078,6 @@ Lists the public keys (RSA/DSA) that can be used for logging in as this user. The format of this file is described in the .Xr sshd 8 manual page. -In the simplest form the format is the same as the -.Pa .pub -identity files. This file is not highly sensitive, but the recommended permissions are read/write for the user, and not accessible by others. .Pp @@ -1129,7 +1126,7 @@ for further details of the format of this file. .It ~/.ssh/rc Commands in this file are executed by .Nm -when the user logs in just before the user's shell (or command) is +when the user logs in, just before the user's shell (or command) is started. See the .Xr sshd 8 @@ -1154,24 +1151,18 @@ The file format and configuration options are described in .It /etc/ssh/ssh_host_dsa_key .It /etc/ssh/ssh_host_rsa_key These three files contain the private parts of the host keys -and are used for -.Cm RhostsRSAAuthentication -and -.Cm HostbasedAuthentication . -If the protocol version 1 -.Cm RhostsRSAAuthentication -method is used, +and are used for host-based authentication. +If protocol version 1 is used, .Nm must be setuid root, since the host key is readable only by root. For protocol version 2, .Nm uses .Xr ssh-keysign 8 -to access the host keys for -.Cm HostbasedAuthentication . -This eliminates the requirement that +to access the host keys, +eliminating the requirement that .Nm -be setuid root when that authentication method is used. +be setuid root when host-based authentication is used. By default .Nm is not setuid root. @@ -1189,7 +1180,7 @@ for further details of the format of this file. .It /etc/ssh/sshrc Commands in this file are executed by .Nm -when the user logs in just before the user's shell (or command) is started. +when the user logs in, just before the user's shell (or command) is started. See the .Xr sshd 8 manual page for more information. |