summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>1999-12-16 07:05:18 +0000
committerlukem <lukem@NetBSD.org>1999-12-16 07:05:18 +0000
commitb5972a49fe2ca7f115424e2171a98c2ef6cfd3ed (patch)
tree8fc582a7b70035ba67912661a838560563327251 /libexec
parent6a0bdfee15aa7c27b456cd0fa6cb4b546ef0491f (diff)
install ftpusers(5) as ftpchroot(5). more cleanups
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ftpd/Makefile3
-rw-r--r--libexec/ftpd/ftpd.89
-rw-r--r--libexec/ftpd/ftpd.conf.57
-rw-r--r--libexec/ftpd/ftpusers.517
4 files changed, 20 insertions, 16 deletions
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index 6850c0ac9ce..9db3505b5bb 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 58f37bad735..70126f4aff7 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 881779b7d6b..70db9912a70 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 3e92525b55f..3c90739f51c 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