From fd49663c75a47fe3e196733d52e9499289359e6b Mon Sep 17 00:00:00 2001
From: jmc <jmc@openbsd.org>
Date: Fri, 18 Apr 2014 22:04:54 +0000
Subject: [PATCH] remove references to rshd;

---
 lib/libc/net/rcmd.3          | 14 +++-----------
 lib/libc/net/rcmdsh.3        |  7 +++----
 share/man/man5/hosts.equiv.5 |  7 +++----
 share/man/man5/login.conf.5  | 10 ++++------
 usr.sbin/inetd/inetd.8       |  5 ++---
 5 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/lib/libc/net/rcmd.3 b/lib/libc/net/rcmd.3
index 447aa23ff16..a17872a9b98 100644
--- a/lib/libc/net/rcmd.3
+++ b/lib/libc/net/rcmd.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rcmd.3,v 1.29 2014/01/21 03:15:45 schwarze Exp $
+.\"	$OpenBSD: rcmd.3,v 1.30 2014/04/18 22:04:54 jmc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 21 2014 $
+.Dd $Mdocdate: April 18 2014 $
 .Dt RCMD 3
 .Os
 .Sh NAME
@@ -96,10 +96,6 @@ and
 functions are used by servers
 to authenticate clients requesting service with
 .Fn rcmd .
-All four functions are present in the same file and are used
-by the
-.Xr rshd 8
-server (among others).
 .Fn iruserok_sa
 is an address family independent variant of
 .Fn iruserok .
@@ -159,9 +155,6 @@ interpretation of
 .Fa *ahost
 will obey the underlying address resolution like DNS.
 .Pp
-The protocol is described in detail in
-.Xr rshd 8 .
-.Pp
 The
 .Fn rresvport
 and
@@ -258,8 +251,7 @@ is overloaded to mean
 .Xr intro 2 ,
 .Xr bindresvport 3 ,
 .Xr bindresvport_sa 3 ,
-.Xr rcmdsh 3 ,
-.Xr rshd 8
+.Xr rcmdsh 3
 .Sh HISTORY
 These
 functions appeared in
diff --git a/lib/libc/net/rcmdsh.3 b/lib/libc/net/rcmdsh.3
index c84a2e4d93c..787f9863c22 100644
--- a/lib/libc/net/rcmdsh.3
+++ b/lib/libc/net/rcmdsh.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rcmdsh.3,v 1.14 2013/06/05 03:39:23 tedu Exp $
+.\"	$OpenBSD: rcmdsh.3,v 1.15 2014/04/18 22:04:54 jmc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 5 2013 $
+.Dd $Mdocdate: April 18 2014 $
 .Dt RCMDSH 3
 .Os
 .Sh NAME
@@ -83,8 +83,7 @@ It returns \-1 on error and prints a diagnostic message on the standard error.
 .Sh SEE ALSO
 .Xr rsh 1 ,
 .Xr socketpair 2 ,
-.Xr rcmd 3 ,
-.Xr rshd 8
+.Xr rcmd 3
 .Sh HISTORY
 The
 .Fn rcmdsh
diff --git a/share/man/man5/hosts.equiv.5 b/share/man/man5/hosts.equiv.5
index dd8d576291c..7a626409481 100644
--- a/share/man/man5/hosts.equiv.5
+++ b/share/man/man5/hosts.equiv.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hosts.equiv.5,v 1.13 2014/03/19 15:24:15 jmc Exp $
+.\"	$OpenBSD: hosts.equiv.5,v 1.14 2014/04/18 22:04:54 jmc Exp $
 .\"
 .\" Copyright (c) 1997 Todd Vierling
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 19 2014 $
+.Dd $Mdocdate: April 18 2014 $
 .Dt HOSTS.EQUIV 5
 .Os
 .Sh NAME
@@ -50,8 +50,7 @@ and
 files list hosts and users which are
 .Dq trusted
 by the local host when a connection is made via
-.Xr rshd 8 ,
-or any other server that uses
+a server that uses
 .Xr ruserok 3 .
 This mechanism bypasses password checks, and is required for access via
 .Xr rsh 1 .
diff --git a/share/man/man5/login.conf.5 b/share/man/man5/login.conf.5
index cdaac4e7060..fe3d3e6c9dd 100644
--- a/share/man/man5/login.conf.5
+++ b/share/man/man5/login.conf.5
@@ -30,10 +30,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $OpenBSD: login.conf.5,v 1.52 2014/02/18 22:54:14 tedu Exp $
+.\" $OpenBSD: login.conf.5,v 1.53 2014/04/18 22:04:54 jmc Exp $
 .\" BSDI $From: login.conf.5,v 2.20 2000/06/26 14:50:38 prb Exp $
 .\"
-.Dd $Mdocdate: February 18 2014 $
+.Dd $Mdocdate: April 18 2014 $
 .Dt LOGIN.CONF 5
 .Os
 .Sh NAME
@@ -50,12 +50,10 @@ as well as session resource limits and environment setup.
 While designed primarily for the
 .Xr login 1
 program,
-it is also used by other programs, e.g.,
+it is also used by other programs, such as
 .Xr ftpd 8 ,
 to determine what means of authentication are available.
-It is also used by programs, e.g.,
-.Xr rshd 8 ,
-which need to set up a user environment.
+It is also used by programs which need to set up a user environment.
 .Pp
 A special record,
 .Dq default ,
diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8
index 360821537e2..9f5a1b01024 100644
--- a/usr.sbin/inetd/inetd.8
+++ b/usr.sbin/inetd/inetd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inetd.8,v 1.35 2012/03/06 01:25:47 dlg Exp $
+.\"	$OpenBSD: inetd.8,v 1.36 2014/04/18 22:04:54 jmc Exp $
 .\" Copyright (c) 1985, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -28,7 +28,7 @@
 .\"
 .\"     from: @(#)inetd.8	6.7 (Berkeley) 3/16/91
 .\"
-.Dd $Mdocdate: March 6 2012 $
+.Dd $Mdocdate: April 18 2014 $
 .Dt INETD 8
 .Os
 .Sh NAME
@@ -373,7 +373,6 @@ only IPv6 traffic will be routed to the server.
 .Xr ftp-proxy 8 ,
 .Xr ftpd 8 ,
 .Xr identd 8 ,
-.Xr rshd 8 ,
 .Xr talkd 8
 .Sh HISTORY
 The
-- 
2.20.1