Document that rsh and ssh will take their invocation name as a hostname to

connect to if argv[0] is not one of the standard program names; closes
PR/1493. While I'm here, change the "host" argument in rsh(1) to "hostname"
for consistency, and also remove some redundancy in the option descriptions.

2 files changed, 33 insertions, 19 deletions

diff --git a/usr.bin/rsh/rsh.1 b/usr.bin/rsh/rsh.1
index 4f53d6be9f9..5f7ed22bb7d 100644
--- a/usr.bin/rsh/rsh.1
+++ b/usr.bin/rsh/rsh.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rsh.1,v 1.6 2000/03/10 20:17:51 aaron Exp $
+.\"	$OpenBSD: rsh.1,v 1.7 2000/11/08 23:51:07 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -44,14 +44,14 @@
 .Op Fl Kdnx
 .Op Fl k Ar realm
 .Op Fl l Ar username
-.Ar host
+.Ar hostname
 .Op Ar command
 .Sh DESCRIPTION
 .Nm
 executes
 .Ar command
 on
-.Ar host .
+.Ar hostname .
 .Pp
 .Nm
 copies its standard input to the remote command, the standard
@@ -65,21 +65,15 @@ normally terminates when the remote command does.
 The options are as follows:
 .Bl -tag -width flag
 .It Fl K
-The
-.Fl K
-option turns off all Kerberos authentication.
+Disable all Kerberos authentication.
 .It Fl d
-The
-.Fl d
-option turns on socket debugging (using
+Enable socket debugging (using
 .Xr setsockopt 2 )
 on the
 .Tn TCP
 sockets used for communication with the remote host.
 .It Fl k
-The
-.Fl k
-option causes
+Causes
 .Nm
 to obtain tickets for the remote host in
 .Ar realm
@@ -94,17 +88,13 @@ Kerberos authentication is used, and authorization is determined
 as in
 .Xr rlogin 1 .
 .It Fl n
-The
-.Fl n
-option redirects input from the special device
+Redirect input from the special device
 .Pa /dev/null
 (see the
 .Sx BUGS
 section of this manual page).
 .It Fl x
-The
-.Fl x
-option turns on
+Enable
 .Tn DES
 encryption for all data exchange.
 This may introduce a significant delay in response time.
@@ -115,6 +105,14 @@ If no
 is specified, you will be logged in on the remote host using
 .Xr rlogin 1 .
 .Pp
+If
+.Nm
+is not invoked with the standard program name
+.Pq Dq rsh ,
+it uses this name as its
+.Ar hostname
+argument.
+.Pp
 Shell meta-characters which are not quoted are interpreted on local machine,
 while quoted meta-characters are interpreted on the remote machine.
 For example, the command
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index 84fd72627e3..a11bcaad86e 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/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.65 2000/11/08 19:37:33 aaron Exp $
+.\" $OpenBSD: ssh.1,v 1.66 2000/11/08 23:51:08 aaron Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -553,6 +553,22 @@ Forces
 .Nm
 to use IPv6 addresses only.
 .El
+.Pp
+If
+.Nm
+is not invoked with one of the standard program names
+.Pf ( Dq ssh ,
+.Dq slogin ,
+.Dq rsh ,
+.Dq rlogin ,
+or
+.Dq remsh ) ,
+it uses this name as its
+.Ar hostname
+argument.
+This is consistent with traditional
+.Xr rsh 1
+behavior.
 .Sh CONFIGURATION FILES
 .Nm
 obtains configuration data from the following sources (in this order):