From b5972a49fe2ca7f115424e2171a98c2ef6cfd3ed Mon Sep 17 00:00:00 2001
From: lukem <lukem@NetBSD.org>
Date: Thu, 16 Dec 1999 07:05:18 +0000
Subject: [PATCH] install ftpusers(5) as ftpchroot(5). more cleanups

---
 libexec/ftpd/Makefile    |  3 ++-
 libexec/ftpd/ftpd.8      |  9 +++++----
 libexec/ftpd/ftpd.conf.5 |  7 +++----
 libexec/ftpd/ftpusers.5  | 17 ++++++++++-------
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index 6850c0ac9cee..9db3505b5bb3 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.37 1999/12/16 01:16:04 lukem Exp $
+#	$NetBSD: Makefile,v 1.38 1999/12/16 07:05:18 lukem Exp $
 #	@(#)Makefile	8.2 (Berkeley) 4/4/94
 
 SRCTOP=	../..
@@ -10,6 +10,7 @@ CPPFLAGS+=-DHASSETPROCTITLE
 DPADD+=	${LIBCRYPT} ${LIBUTIL}
 LDADD+=	-lcrypt -lutil
 MAN=	ftpd.conf.5 ftpusers.5 ftpd.8
+MLINKS=	ftpusers.5 ftpchroot.5
 
 # for `internal' ls
 SRCS+=	ls.c cmp.c print.c stat_flags.c util.c
diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index 58f37bad735d..70126f4aff7e 100644
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ftpd.8,v 1.44 1999/12/16 02:21:37 lukem Exp $
+.\"	$NetBSD: ftpd.8,v 1.45 1999/12/16 07:05:18 lukem Exp $
 .\"
 .\" Copyright (c) 1997-1999 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -290,8 +290,7 @@ shell is assumed to be
 .Pa /bin/sh .
 .It
 If directed by the file
-.Pa /etc/ftpchroot
-(see below)
+.Xr ftpchroot 5
 the session's root will be changed to the user's login directory by
 .Xr chroot 2
 as for an
@@ -466,7 +465,8 @@ as login shell.
 .Sh FILES
 .Bl -tag -width /etc/ftpwelcome -compact
 .It Pa /etc/ftpchroot
-List of normal users who should be chroot'd.
+List of normal users who should be
+.Xr chroot 2 ed.
 .It Pa /etc/ftpd.conf
 Configure file conversions and other settings.
 .It Pa /etc/ftpusers
@@ -483,6 +483,7 @@ If it exists, displayed and access is refused.
 .Xr skey 1 ,
 .Xr getusershell 3 ,
 .Xr ftpd.conf 5 ,
+.Xr ftpchroot 5 ,
 .Xr ftpusers 5 ,
 .Xr syslogd 8
 .Sh STANDARDS
diff --git a/libexec/ftpd/ftpd.conf.5 b/libexec/ftpd/ftpd.conf.5
index 881779b7d6bf..70db9912a707 100644
--- a/libexec/ftpd/ftpd.conf.5
+++ b/libexec/ftpd/ftpd.conf.5
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ftpd.conf.5,v 1.2 1999/12/16 06:56:49 lukem Exp $
+.\"	$NetBSD: ftpd.conf.5,v 1.3 1999/12/16 07:05:19 lukem Exp $
 .\"
 .\" Copyright (c) 1997-1999 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -131,9 +131,7 @@ is performed after login.
 .It Sy CHROOT
 .Xr chroot 2 ed
 users (as per
-.Xr ftpusers 5
-and
-.Pa /etc/ftpchroot ) .
+.Xr ftpchroot 5 ) .
 A
 .Xr chroot 2
 is performed after login.
@@ -330,6 +328,7 @@ umask         guest  0707
 This file.
 .El
 .Sh SEE ALSO
+.Xr ftpchroot 5 ,
 .Xr ftpusers 5 ,
 .Xr ftpd 8
 .Sh HISTORY
diff --git a/libexec/ftpd/ftpusers.5 b/libexec/ftpd/ftpusers.5
index 3e92525b55f0..3c90739f51c3 100644
--- a/libexec/ftpd/ftpusers.5
+++ b/libexec/ftpd/ftpusers.5
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ftpusers.5,v 1.1 1999/12/16 01:16:04 lukem Exp $
+.\"	$NetBSD: ftpusers.5,v 1.2 1999/12/16 07:05:19 lukem Exp $
 .\"
 .\" Copyright (c) 1997-1999 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -34,23 +34,25 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"
-.Dd December 13, 1999
+.Dd December 16, 1999
 .Dt FTPUSERS 5
 .Os
 .Sh NAME
-.Nm ftpusers
+.Nm ftpusers ,
+.Nm ftpchroot
 .Nd
 .Xr ftpd 8
-access control file.
+access control file
 .Sh DESCRIPTION
 The
 .Nm
 file provides user access control for
 .Xr ftpd 8
-by defining which users may authenticate.
+by defining which users may login.
 .Pp
-If the file does not exist, all users are denied access.
+If the
+.Nm
+file does not exist, all users are denied access.
 .Pp
 A
 .Dq \e
@@ -150,5 +152,6 @@ This file.
 .El
 .Sh SEE ALSO
 .Xr fnmatch 3 ,
+.Xr inet_net_pton 3 ,
 .Xr ftpd.conf 5 ,
 .Xr ftpd 8