diff options
| -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 e963f655351b..090e4bb56b18 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 # 20090801: vimage.h removed in favour of vnet.h OLD_FILES+=usr/include/sys/vimage.h # 20090719: library version bump for 8.0 diff --git a/etc/inetd.conf b/etc/inetd.conf index 6f2e234b2578..bbc21dfca603 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 72ec91315afe..26a8ff236a2b 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -9,7 +9,6 @@ SUBDIR= ${_atrun} \ fingerd \ ftpd \ getty \ - lukemftpd \ ${_mail.local} \ ${_mknetid} \ ${_pppoed} \ |