svn commit: r338147 - in head: etc libexec/ftpd

[Brad Davis]

Author: brd
Date: Tue Aug 21 17:07:52 2018
New Revision: 338147
URL: https://svnweb.freebsd.org/changeset/base/338147

Log:
  Move ftpusers to libexec/ftpd/
  
  Thsi helps with pkgbase by switching to CONFS so that ftpusers will be
  properly tagged as a config file.
  
  Approved by:	will (mentor)
  Differential Revision:	https://reviews.freebsd.org/D16787

Added:
  head/libexec/ftpd/ftpusers
     - copied unchanged from r338146, head/etc/ftpusers
Deleted:
  head/etc/ftpusers
Modified:
  head/etc/Makefile
  head/libexec/ftpd/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Tue Aug 21 17:01:47 2018	(r338146)
+++ head/etc/Makefile	Tue Aug 21 17:07:52 2018	(r338147)
@@ -56,10 +56,6 @@ BIN1+=	etc.${MACHINE_CPUARCH}/ttys
 BIN1+= amd.map
 .endif
 
-.if ${MK_FTP} != "no"
-BIN1+= ftpusers
-.endif
-
 .if ${MK_LOCATE} != "no"
 BIN1+=	${SRCTOP}/usr.bin/locate/locate/locate.rc
 .endif

Modified: head/libexec/ftpd/Makefile
==============================================================================
--- head/libexec/ftpd/Makefile	Tue Aug 21 17:01:47 2018	(r338146)
+++ head/libexec/ftpd/Makefile	Tue Aug 21 17:07:52 2018	(r338147)
@@ -3,6 +3,7 @@
 
 .include <src.opts.mk>
 
+CONFS=	ftpusers
 PROG=	ftpd
 MAN=	ftpd.8 ftpchroot.5
 SRCS=	ftpd.c ftpcmd.y logwtmp.c popen.c

Copied: head/libexec/ftpd/ftpusers (from r338146, head/etc/ftpusers)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/libexec/ftpd/ftpusers	Tue Aug 21 17:07:52 2018	(r338147, copy of r338146, head/etc/ftpusers)
@@ -0,0 +1,29 @@
+# $FreeBSD$
+#
+# list of users disallowed any ftp access.
+# read by ftpd(8).
+root
+toor
+daemon
+operator
+bin
+tty
+kmem
+games
+news
+ntpd
+man
+sshd
+smmsp
+mailnull
+bind
+unbound
+proxy
+_pflogd
+_dhcp
+uucp
+pop
+auditdistd
+www
+hast
+nobody