From owner-svn-src-head@freebsd.org  Tue Aug 21 17:07:53 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A39DA107948A;
 Tue, 21 Aug 2018 17:07:53 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 59B1F8CDD9;
 Tue, 21 Aug 2018 17:07:53 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 36BA726D55;
 Tue, 21 Aug 2018 17:07:53 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7LH7qoG044359;
 Tue, 21 Aug 2018 17:07:52 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7LH7q16044357;
 Tue, 21 Aug 2018 17:07:52 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201808211707.w7LH7q16044357@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org
 using -f
From: Brad Davis <brd@FreeBSD.org>
Date: Tue, 21 Aug 2018 17:07:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r338147 - in head: etc libexec/ftpd
X-SVN-Group: head
X-SVN-Commit-Author: brd
X-SVN-Commit-Paths: in head: etc libexec/ftpd
X-SVN-Commit-Revision: 338147
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2018 17:07:53 -0000

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