diff options
| author | Brad Davis <brd@FreeBSD.org> | 2018-08-21 17:07:52 +0000 |
|---|---|---|
| committer | Brad Davis <brd@FreeBSD.org> | 2018-08-21 17:07:52 +0000 |
| commit | 541075a618224e50431824d139c3e5fbdc3cfe7e (patch) | |
| tree | 5e525da13d3be1d50545a91cafda24086b1b6771 | |
| parent | 64be79ef76069b725c6c7a7b22425642b77a927a (diff) | |
| download | src-541075a618224e50431824d139c3e5fbdc3cfe7e.tar.gz src-541075a618224e50431824d139c3e5fbdc3cfe7e.zip | |
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
Notes
Notes:
svn path=/head/; revision=338147
| -rw-r--r-- | etc/Makefile | 4 | ||||
| -rw-r--r-- | libexec/ftpd/Makefile | 1 | ||||
| -rw-r--r-- | libexec/ftpd/ftpusers (renamed from etc/ftpusers) | 0 |
3 files changed, 1 insertions, 4 deletions
diff --git a/etc/Makefile b/etc/Makefile index c17f08996c30..b813c362f37e 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -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 diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile index 7d6f5bde445e..f3a52d08521d 100644 --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -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 diff --git a/etc/ftpusers b/libexec/ftpd/ftpusers index 96a751399532..96a751399532 100644 --- a/etc/ftpusers +++ b/libexec/ftpd/ftpusers |