1 files changed, 8 insertions, 17 deletions
diff --git a/ssh.1 b/ssh.1
index cfe1655e6..0ebe177f5 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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
+and are used for host-based authentication.
-.Cm RhostsRSAAuthentication
+If protocol version 1 is used,
-and
-.Cm HostbasedAuthentication .
-If the protocol version 1
-.Cm RhostsRSAAuthentication
-method 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
+to access the host keys,
-.Cm HostbasedAuthentication .
+eliminating the requirement that
-This eliminates 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.

diff --git a/ssh.1 b/ssh.1 index cfe1655e6..0ebe177f5 100644 --- a/ssh.1 +++ b/ssh.1
@@ -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.244 2006/01/06 13:27:32 jmc Exp $	37	.\" $OpenBSD: ssh.1,v 1.245 2006/01/06 13:29:10 jmc Exp $
38	.Dd September 25, 1999	38	.Dd September 25, 1999
39	.Dt SSH 1	39	.Dt SSH 1
40	.Os	40	.Os
@@ -1078,9 +1078,6 @@ Lists the public keys (RSA/DSA) that can be used for logging in as this user.
1078	The format of this file is described in the	1078	The format of this file is described in the
1079	.Xr sshd 8	1079	.Xr sshd 8
1080	manual page.	1080	manual page.
1081	In the simplest form the format is the same as the
1082	.Pa .pub
1083	identity files.
1084	This file is not highly sensitive, but the recommended	1081	This file is not highly sensitive, but the recommended
1085	permissions are read/write for the user, and not accessible by others.	1082	permissions are read/write for the user, and not accessible by others.
1086	.Pp	1083	.Pp
@@ -1129,7 +1126,7 @@ for further details of the format of this file.
1129	.It ~/.ssh/rc	1126	.It ~/.ssh/rc
1130	Commands in this file are executed by	1127	Commands in this file are executed by
1131	.Nm	1128	.Nm
1132	when the user logs in just before the user's shell (or command) is	1129	when the user logs in, just before the user's shell (or command) is
1133	started.	1130	started.
1134	See the	1131	See the
1135	.Xr sshd 8	1132	.Xr sshd 8
@@ -1154,24 +1151,18 @@ The file format and configuration options are described in
1154	.It /etc/ssh/ssh_host_dsa_key	1151	.It /etc/ssh/ssh_host_dsa_key
1155	.It /etc/ssh/ssh_host_rsa_key	1152	.It /etc/ssh/ssh_host_rsa_key
1156	These three files contain the private parts of the host keys	1153	These three files contain the private parts of the host keys
1157	and are used for	1154	and are used for host-based authentication.
1158	.Cm RhostsRSAAuthentication	1155	If protocol version 1 is used,
1159	and
1160	.Cm HostbasedAuthentication .
1161	If the protocol version 1
1162	.Cm RhostsRSAAuthentication
1163	method is used,
1164	.Nm	1156	.Nm
1165	must be setuid root, since the host key is readable only by root.	1157	must be setuid root, since the host key is readable only by root.
1166	For protocol version 2,	1158	For protocol version 2,
1167	.Nm	1159	.Nm
1168	uses	1160	uses
1169	.Xr ssh-keysign 8	1161	.Xr ssh-keysign 8
1170	to access the host keys for	1162	to access the host keys,
1171	.Cm HostbasedAuthentication .	1163	eliminating the requirement that
1172	This eliminates the requirement that
1173	.Nm	1164	.Nm
1174	be setuid root when that authentication method is used.	1165	be setuid root when host-based authentication is used.
1175	By default	1166	By default
1176	.Nm	1167	.Nm
1177	is not setuid root.	1168	is not setuid root.
@@ -1189,7 +1180,7 @@ for further details of the format of this file.
1189	.It /etc/ssh/sshrc	1180	.It /etc/ssh/sshrc
1190	Commands in this file are executed by	1181	Commands in this file are executed by
1191	.Nm	1182	.Nm
1192	when the user logs in just before the user's shell (or command) is started.	1183	when the user logs in, just before the user's shell (or command) is started.
1193	See the	1184	See the
1194	.Xr sshd 8	1185	.Xr sshd 8
1195	manual page for more information.	1186	manual page for more information.