Delete the empty example file "ftpchroot"; no example is needed.

Move the one useful bit of information contained in the file ("one
user name per line") to the ftpd(8) manual page where it belongs.
OK deraadt@ sthen@

diff --git a/etc/Makefile b/etc/Makefile
index f4d74df..691116a 100644 (file)
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.410 2015/10/16 15:54:55 schwarze Exp $
+#      $OpenBSD: Makefile,v 1.411 2015/10/19 19:08:44 schwarze Exp $
 
 TZDIR=         /usr/share/zoneinfo
 LOCALTIME=     Canada/Mountain
@@ -37,7 +37,7 @@ MUTABLE=changelist csh.cshrc csh.login csh.logout daily \
        pf.os protocols rc rc.conf rpc services shells syslog.conf weekly
 
 # -rw-r--r--
-EXAMPLES=chio.conf dhclient.conf dhcpd.conf exports ftpchroot \
+EXAMPLES=chio.conf dhclient.conf dhcpd.conf exports \
        httpd.conf ifstated.conf inetd.conf \
        man.conf mixerctl.conf mrouted.conf \
        ntpd.conf printcap rbootd.conf remote sensorsd.conf

diff --git a/etc/examples/ftpchroot b/etc/examples/ftpchroot
deleted file mode 100644 (file)
index fb91879..0000000
--- a/etc/examples/ftpchroot
+++ /dev/null
@@ -1,4 +0,0 @@
-#      $OpenBSD: ftpchroot,v 1.1 2014/07/12 03:52:39 deraadt Exp $
-#
-# list of users (one per line) given ftp access to a chrooted area.
-# read by ftpd(8).

diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index b01405a..6ef5158 100644 (file)
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: ftpd.8,v 1.73 2015/01/15 19:06:32 schwarze Exp $
+.\"    $OpenBSD: ftpd.8,v 1.74 2015/10/19 19:08:44 schwarze Exp $
 .\"    $NetBSD: ftpd.8,v 1.8 1996/01/14 20:55:23 thorpej Exp $
 .\"
 .\" Copyright (c) 1985, 1988, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)ftpd.8     8.2 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: January 15 2015 $
+.Dd $Mdocdate: October 19 2015 $
 .Dt FTPD 8
 .Os
 .Sh NAME
@@ -315,6 +315,7 @@ The user must have a standard shell as described by
 .It
 If the user name appears in the file
 .Pa /etc/ftpchroot ,
+which is a text file containing one user name per line,
 the session's root will be changed to the user's login directory by
 .Xr chroot 2
 as for an