diff options
| author | remko <remko@FreeBSD.org> | 2009-09-03 16:34:20 +0000 |
|---|---|---|
| committer | remko <remko@FreeBSD.org> | 2009-09-03 16:34:20 +0000 |
| commit | dcd2780b1c5f036dbcf08febd7e8a249f0199218 (patch) | |
| tree | eb272679ce333d492964cdee54308bc0c6be3e5a | |
| parent | d8165e001962c64b9b665cb5bc9e20184cdb5fa0 (diff) | |
| download | FreeBSD-src-dcd2780b1c5f036dbcf08febd7e8a249f0199218.zip FreeBSD-src-dcd2780b1c5f036dbcf08febd7e8a249f0199218.tar.gz | |
Do the first step in removing lukemftpd from the base system. Disconnect
it from the build.
If you are using the FTP daemon, please consider using the port ftp/tnftpd
which is the same FTP server, but newer and might have more/better
functionality.
This results in us providing only one ftp daemon by default.
Reviewed by: bz
Approved by: imp (mentor, implicit)
MFC after: 3 days
Silence from: obrien
| -rw-r--r-- | ObsoleteFiles.inc | 5 | ||||
| -rw-r--r-- | etc/inetd.conf | 2 | ||||
| -rw-r--r-- | libexec/Makefile | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 54be9dd..9e2d734 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090904: remove lukemftpd +OLD_FILES+=usr/libexec/lukemftpd +OLD_FILES+=usr/share/man/man5/ftpd.conf.5.gz +OLD_FILES+=usr/share/man/man5/ftpusers.5.gz +OLD_FILES+=usr/share/man/man8/lukemftpd.8.gz # 20090902: BSD.{x11,x11-4}.dist are dead and BSD.local.dist lives in ports/ OLD_FILES+=etc/mtree/BSD.local.dist OLD_FILES+=etc/mtree/BSD.x11.dist diff --git a/etc/inetd.conf b/etc/inetd.conf index 6f2e234..bbc21df 100644 --- a/etc/inetd.conf +++ b/etc/inetd.conf @@ -8,8 +8,6 @@ # #ftp stream tcp nowait root /usr/libexec/ftpd ftpd -l #ftp stream tcp6 nowait root /usr/libexec/ftpd ftpd -l -#ftp stream tcp nowait root /usr/libexec/lukemftpd ftpd -l -r -#ftp stream tcp6 nowait root /usr/libexec/lukemftpd ftpd -l -r #ssh stream tcp nowait root /usr/sbin/sshd sshd -i -4 #ssh stream tcp6 nowait root /usr/sbin/sshd sshd -i -6 #telnet stream tcp nowait root /usr/libexec/telnetd telnetd diff --git a/libexec/Makefile b/libexec/Makefile index 72ec913..26a8ff2 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -9,7 +9,6 @@ SUBDIR= ${_atrun} \ fingerd \ ftpd \ getty \ - lukemftpd \ ${_mail.local} \ ${_mknetid} \ ${_pppoed} \ |
