Date: Wed, 28 Sep 2022 13:54:46 -0700 From: Xin LI <delphij@gmail.com> To: Brooks Davis <brooks@freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 0eea46fb1f83 - main - Remove telnetd Message-ID: <CAGMYy3ujZiGZg=x5H_c4HmPbLCQJXJ2dk9ET1VOWqKhDLSLKEQ@mail.gmail.com> In-Reply-To: <202209281854.28SIsEXN074680@gitrepo.freebsd.org> References: <202209281854.28SIsEXN074680@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] This removal is incomplete. Could you please also remove it from e.g. usr.sbin/inetd/inetd.conf, release/packages/Makefile.package, bsdbox, and mentions in various manual pages? On Wed, Sep 28, 2022 at 11:54 AM Brooks Davis <brooks@freebsd.org> wrote: > The branch main has been updated by brooks: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=0eea46fb1f83f6091df92b5f2eae993cd6c2c873 > > commit 0eea46fb1f83f6091df92b5f2eae993cd6c2c873 > Author: Brooks Davis <brooks@FreeBSD.org> > AuthorDate: 2022-09-28 18:53:10 +0000 > Commit: Brooks Davis <brooks@FreeBSD.org> > CommitDate: 2022-09-28 18:53:49 +0000 > > Remove telnetd > > The telnetd codebase is unmaintained and has a number of quality > issues. Telnet has been largely supplanted by ssh. If needed, a port is > available (net/freebsd-telnetd), but a more maintained implementation > should be prefered. > > While the telnet client suffers from the same issues, it is deemed > to be of lower risk and is required to connect to legacy devices, so > it remains. > > Reviewed by: emaste, imp > Differential Revision: https://reviews.freebsd.org/D36620 > --- > ObsoleteFiles.inc | 5 ++++ > lib/libpam/pam.d/Makefile | 6 ----- > lib/libpam/pam.d/telnetd | 26 ------------------ > libexec/Makefile | 5 ---- > libexec/telnetd/Makefile | 45 > -------------------------------- > libexec/telnetd/Makefile.depend | 25 ------------------ > libexec/telnetd/Makefile.depend.options | 6 ----- > tools/build/mk/OptionalObsoleteFiles.inc | 3 --- > 8 files changed, 5 insertions(+), 116 deletions(-) > > diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc > index 2056b4296a94..0a0c6dfb044a 100644 > --- a/ObsoleteFiles.inc > +++ b/ObsoleteFiles.inc > @@ -52,6 +52,11 @@ > # xargs -n1 | sort | uniq -d; > # done > > +# 20220928: telnetd(8) removed > +OLD_FILES+=etc/pam.d/telnetd > +OLD_FILES+=usr/libexec/telnetd > +OLD_FILES+=usr/share/man/man8/telnetd.8.gz > + > # 20220914: domain(9) updated > OLD_FILES+=usr/share/man/man9/domain_init.9.gz > OLD_FILES+=usr/share/man/man9/pfctlinput.9.gz > diff --git a/lib/libpam/pam.d/Makefile b/lib/libpam/pam.d/Makefile > index 1499f916cb17..da30a4682f53 100644 > --- a/lib/libpam/pam.d/Makefile > +++ b/lib/libpam/pam.d/Makefile > @@ -34,10 +34,4 @@ afterinstallconfig: > ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${CONFDIR}/ftpd > ${DESTDIR}${CONFDIR}/ftp > .endif > > -.if ${MK_TELNET} != "no" > -CONFGROUPS+= TELNET > -TELNET+= telnetd > -TELNETPACKAGE= telnet > -.endif > - > .include <bsd.prog.mk> > diff --git a/lib/libpam/pam.d/telnetd b/lib/libpam/pam.d/telnetd > deleted file mode 100644 > index fb2f523d4ad1..000000000000 > --- a/lib/libpam/pam.d/telnetd > +++ /dev/null > @@ -1,26 +0,0 @@ > -# > -# $FreeBSD$ > -# > -# PAM configuration for the "telnetd" service > -# > - > -# auth > -auth sufficient pam_opie.so no_warn > no_fake_prompts > -auth requisite pam_opieaccess.so no_warn allow_local > -#auth sufficient pam_krb5.so no_warn > try_first_pass > -#auth sufficient pam_ssh.so no_warn > try_first_pass > -auth required pam_unix.so no_warn > try_first_pass > - > -# account > -account required pam_nologin.so > -#account required pam_krb5.so > -account required pam_login_access.so > -account required pam_unix.so > - > -# session > -#session optional pam_ssh.so want_agent > -session required pam_lastlog.so no_fail > - > -# password > -#password sufficient pam_krb5.so no_warn > try_first_pass > -password required pam_unix.so no_warn > try_first_pass > diff --git a/libexec/Makefile b/libexec/Makefile > index 1b41ae81565c..8d7565fe3ee5 100644 > --- a/libexec/Makefile > +++ b/libexec/Makefile > @@ -27,7 +27,6 @@ SUBDIR= ${_atf} \ > ${_rtld-elf} \ > save-entropy \ > ${_smrsh} \ > - ${_telnetd} \ > ${_tests} \ > ${_tftp-proxy} \ > ulog-helper \ > @@ -104,10 +103,6 @@ SUBDIR+= talkd > SUBDIR+= tcpd > .endif > > -.if ${MK_TELNET} != "no" > -_telnetd= telnetd > -.endif > - > .if ${MK_TFTP} != "no" > SUBDIR+= tftpd > .endif > diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile > deleted file mode 100644 > index 09136d360a71..000000000000 > --- a/libexec/telnetd/Makefile > +++ /dev/null > @@ -1,45 +0,0 @@ > -# $FreeBSD$ > - > -# Do not define -DKLUDGELINEMODE, as it does not interact well with many > -# telnet implementations. > - > -.include <src.opts.mk> > - > -PACKAGE= telnet > - > -TELNETDIR= ${SRCTOP}/contrib/telnet > -.PATH: ${TELNETDIR}/telnetd > - > -PROG= telnetd > -MAN= telnetd.8 > - > -SRCS= global.c slc.c state.c sys_term.c telnetd.c \ > - termstat.c utility.c > - > -WARNS?= 2 > -WFORMAT?= 0 > - > -CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \ > - -DENV_HACK -DSTREAMSPTY > - > -.if ${MK_INET6_SUPPORT} != "no" > -CFLAGS+= -DINET6 > -.endif > - > -CFLAGS+= -I${TELNETDIR} > -CFLAGS+= -I${TELNETDIR}/telnet > - > -LIBADD= telnet util tinfow > - > -.if ${MK_OPENSSL} != "no" > -SRCS+= authenc.c > -CFLAGS+= -DAUTHENTICATION -DENCRYPTION > -LIBADD+= mp crypto pam > -.endif > - > -.if ${MK_KERBEROS_SUPPORT} != "no" > -CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write > -LIBADD+= krb5 roken > -.endif > - > -.include <bsd.prog.mk> > diff --git a/libexec/telnetd/Makefile.depend > b/libexec/telnetd/Makefile.depend > deleted file mode 100644 > index 60b7e4479a3f..000000000000 > --- a/libexec/telnetd/Makefile.depend > +++ /dev/null > @@ -1,25 +0,0 @@ > -# $FreeBSD$ > -# Autogenerated - do NOT edit! > - > -DIRDEPS = \ > - include \ > - include/arpa \ > - include/xlocale \ > - lib/${CSU_DIR} \ > - lib/libc \ > - lib/libcom_err \ > - lib/libcompiler_rt \ > - lib/libcrypt \ > - lib/libmp \ > - lib/libpam/libpam \ > - lib/libtelnet \ > - lib/libthr \ > - lib/libutil \ > - lib/ncurses/ncursesw \ > - > - > -.include <dirdeps.mk> > - > -.if ${DEP_RELDIR} == ${_DEP_RELDIR} > -# local dependencies - needed for -jN in clean tree > -.endif > diff --git a/libexec/telnetd/Makefile.depend.options > b/libexec/telnetd/Makefile.depend.options > deleted file mode 100644 > index 4c4ba810c0e2..000000000000 > --- a/libexec/telnetd/Makefile.depend.options > +++ /dev/null > @@ -1,6 +0,0 @@ > -# $FreeBSD$ > -# This file is not autogenerated - take care! > - > -DIRDEPS_OPTIONS= KERBEROS_SUPPORT OPENSSL > - > -.include <dirdeps-options.mk> > diff --git a/tools/build/mk/OptionalObsoleteFiles.inc > b/tools/build/mk/OptionalObsoleteFiles.inc > index 1bcc0d2d80bc..4145859f21cd 100644 > --- a/tools/build/mk/OptionalObsoleteFiles.inc > +++ b/tools/build/mk/OptionalObsoleteFiles.inc > @@ -8242,11 +8242,8 @@ OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat > .endif > > .if ${MK_TELNET} == no > -OLD_FILES+=etc/pam.d/telnetd > OLD_FILES+=usr/bin/telnet > -OLD_FILES+=usr/libexec/telnetd > OLD_FILES+=usr/share/man/man1/telnet.1.gz > -OLD_FILES+=usr/share/man/man8/telnetd.8.gz > .endif > > .if ${MK_TESTS} == yes > [-- Attachment #2 --] <div dir="ltr"><div class="gmail_default" style="font-family:monospace,monospace">This removal is incomplete. Could you please also remove it from e.g. usr.sbin/inetd/inetd.conf, release/packages/Makefile.package, bsdbox, and mentions in various manual pages?</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Sep 28, 2022 at 11:54 AM Brooks Davis <<a href="mailto:brooks@freebsd.org">brooks@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The branch main has been updated by brooks:<br> <br> URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=0eea46fb1f83f6091df92b5f2eae993cd6c2c873" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=0eea46fb1f83f6091df92b5f2eae993cd6c2c873</a><br>; <br> commit 0eea46fb1f83f6091df92b5f2eae993cd6c2c873<br> Author: Brooks Davis <brooks@FreeBSD.org><br> AuthorDate: 2022-09-28 18:53:10 +0000<br> Commit: Brooks Davis <brooks@FreeBSD.org><br> CommitDate: 2022-09-28 18:53:49 +0000<br> <br> Remove telnetd<br> <br> The telnetd codebase is unmaintained and has a number of quality<br> issues. Telnet has been largely supplanted by ssh. If needed, a port is<br> available (net/freebsd-telnetd), but a more maintained implementation<br> should be prefered.<br> <br> While the telnet client suffers from the same issues, it is deemed<br> to be of lower risk and is required to connect to legacy devices, so<br> it remains.<br> <br> Reviewed by: emaste, imp<br> Differential Revision: <a href="https://reviews.freebsd.org/D36620" rel="noreferrer" target="_blank">https://reviews.freebsd.org/D36620</a><br>; ---<br> ObsoleteFiles.inc | 5 ++++<br> lib/libpam/pam.d/Makefile | 6 -----<br> lib/libpam/pam.d/telnetd | 26 ------------------<br> libexec/Makefile | 5 ----<br> libexec/telnetd/Makefile | 45 --------------------------------<br> libexec/telnetd/Makefile.depend | 25 ------------------<br> libexec/telnetd/Makefile.depend.options | 6 -----<br> tools/build/mk/OptionalObsoleteFiles.inc | 3 ---<br> 8 files changed, 5 insertions(+), 116 deletions(-)<br> <br> diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc<br> index 2056b4296a94..0a0c6dfb044a 100644<br> --- a/ObsoleteFiles.inc<br> +++ b/ObsoleteFiles.inc<br> @@ -52,6 +52,11 @@<br> # xargs -n1 | sort | uniq -d;<br> # done<br> <br> +# 20220928: telnetd(8) removed<br> +OLD_FILES+=etc/pam.d/telnetd<br> +OLD_FILES+=usr/libexec/telnetd<br> +OLD_FILES+=usr/share/man/man8/telnetd.8.gz<br> +<br> # 20220914: domain(9) updated<br> OLD_FILES+=usr/share/man/man9/domain_init.9.gz<br> OLD_FILES+=usr/share/man/man9/pfctlinput.9.gz<br> diff --git a/lib/libpam/pam.d/Makefile b/lib/libpam/pam.d/Makefile<br> index 1499f916cb17..da30a4682f53 100644<br> --- a/lib/libpam/pam.d/Makefile<br> +++ b/lib/libpam/pam.d/Makefile<br> @@ -34,10 +34,4 @@ afterinstallconfig:<br> ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${CONFDIR}/ftpd ${DESTDIR}${CONFDIR}/ftp<br> .endif<br> <br> -.if ${MK_TELNET} != "no"<br> -CONFGROUPS+= TELNET<br> -TELNET+= telnetd<br> -TELNETPACKAGE= telnet<br> -.endif<br> -<br> .include <<a href="http://bsd.prog.mk" rel="noreferrer" target="_blank">bsd.prog.mk</a>><br> diff --git a/lib/libpam/pam.d/telnetd b/lib/libpam/pam.d/telnetd<br> deleted file mode 100644<br> index fb2f523d4ad1..000000000000<br> --- a/lib/libpam/pam.d/telnetd<br> +++ /dev/null<br> @@ -1,26 +0,0 @@<br> -#<br> -# $FreeBSD$<br> -#<br> -# PAM configuration for the "telnetd" service<br> -#<br> -<br> -# auth<br> -auth sufficient pam_opie.so no_warn no_fake_prompts<br> -auth requisite pam_opieaccess.so no_warn allow_local<br> -#auth sufficient pam_krb5.so no_warn try_first_pass<br> -#auth sufficient pam_ssh.so no_warn try_first_pass<br> -auth required pam_unix.so no_warn try_first_pass<br> -<br> -# account<br> -account required pam_nologin.so<br> -#account required pam_krb5.so<br> -account required pam_login_access.so<br> -account required pam_unix.so<br> -<br> -# session<br> -#session optional pam_ssh.so want_agent<br> -session required pam_lastlog.so no_fail<br> -<br> -# password<br> -#password sufficient pam_krb5.so no_warn try_first_pass<br> -password required pam_unix.so no_warn try_first_pass<br> diff --git a/libexec/Makefile b/libexec/Makefile<br> index 1b41ae81565c..8d7565fe3ee5 100644<br> --- a/libexec/Makefile<br> +++ b/libexec/Makefile<br> @@ -27,7 +27,6 @@ SUBDIR= ${_atf} \<br> ${_rtld-elf} \<br> save-entropy \<br> ${_smrsh} \<br> - ${_telnetd} \<br> ${_tests} \<br> ${_tftp-proxy} \<br> ulog-helper \<br> @@ -104,10 +103,6 @@ SUBDIR+= talkd<br> SUBDIR+= tcpd<br> .endif<br> <br> -.if ${MK_TELNET} != "no"<br> -_telnetd= telnetd<br> -.endif<br> -<br> .if ${MK_TFTP} != "no"<br> SUBDIR+= tftpd<br> .endif<br> diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile<br> deleted file mode 100644<br> index 09136d360a71..000000000000<br> --- a/libexec/telnetd/Makefile<br> +++ /dev/null<br> @@ -1,45 +0,0 @@<br> -# $FreeBSD$<br> -<br> -# Do not define -DKLUDGELINEMODE, as it does not interact well with many<br> -# telnet implementations.<br> -<br> -.include <<a href="http://src.opts.mk" rel="noreferrer" target="_blank">src.opts.mk</a>><br> -<br> -PACKAGE= telnet<br> -<br> -TELNETDIR= ${SRCTOP}/contrib/telnet<br> -.PATH: ${TELNETDIR}/telnetd<br> -<br> -PROG= telnetd<br> -MAN= telnetd.8<br> -<br> -SRCS= global.c slc.c state.c sys_term.c telnetd.c \<br> - termstat.c utility.c<br> -<br> -WARNS?= 2<br> -WFORMAT?= 0<br> -<br> -CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \<br> - -DENV_HACK -DSTREAMSPTY<br> -<br> -.if ${MK_INET6_SUPPORT} != "no"<br> -CFLAGS+= -DINET6<br> -.endif<br> -<br> -CFLAGS+= -I${TELNETDIR}<br> -CFLAGS+= -I${TELNETDIR}/telnet<br> -<br> -LIBADD= telnet util tinfow<br> -<br> -.if ${MK_OPENSSL} != "no"<br> -SRCS+= authenc.c<br> -CFLAGS+= -DAUTHENTICATION -DENCRYPTION<br> -LIBADD+= mp crypto pam<br> -.endif<br> -<br> -.if ${MK_KERBEROS_SUPPORT} != "no"<br> -CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write<br> -LIBADD+= krb5 roken<br> -.endif<br> -<br> -.include <<a href="http://bsd.prog.mk" rel="noreferrer" target="_blank">bsd.prog.mk</a>><br> diff --git a/libexec/telnetd/Makefile.depend b/libexec/telnetd/Makefile.depend<br> deleted file mode 100644<br> index 60b7e4479a3f..000000000000<br> --- a/libexec/telnetd/Makefile.depend<br> +++ /dev/null<br> @@ -1,25 +0,0 @@<br> -# $FreeBSD$<br> -# Autogenerated - do NOT edit!<br> -<br> -DIRDEPS = \<br> - include \<br> - include/arpa \<br> - include/xlocale \<br> - lib/${CSU_DIR} \<br> - lib/libc \<br> - lib/libcom_err \<br> - lib/libcompiler_rt \<br> - lib/libcrypt \<br> - lib/libmp \<br> - lib/libpam/libpam \<br> - lib/libtelnet \<br> - lib/libthr \<br> - lib/libutil \<br> - lib/ncurses/ncursesw \<br> -<br> -<br> -.include <<a href="http://dirdeps.mk" rel="noreferrer" target="_blank">dirdeps.mk</a>><br> -<br> -.if ${DEP_RELDIR} == ${_DEP_RELDIR}<br> -# local dependencies - needed for -jN in clean tree<br> -.endif<br> diff --git a/libexec/telnetd/Makefile.depend.options b/libexec/telnetd/Makefile.depend.options<br> deleted file mode 100644<br> index 4c4ba810c0e2..000000000000<br> --- a/libexec/telnetd/Makefile.depend.options<br> +++ /dev/null<br> @@ -1,6 +0,0 @@<br> -# $FreeBSD$<br> -# This file is not autogenerated - take care!<br> -<br> -DIRDEPS_OPTIONS= KERBEROS_SUPPORT OPENSSL<br> -<br> -.include <<a href="http://dirdeps-options.mk" rel="noreferrer" target="_blank">dirdeps-options.mk</a>><br> diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc<br> index 1bcc0d2d80bc..4145859f21cd 100644<br> --- a/tools/build/mk/OptionalObsoleteFiles.inc<br> +++ b/tools/build/mk/OptionalObsoleteFiles.inc<br> @@ -8242,11 +8242,8 @@ OLD_FILES+=usr/share/nls/uk_UA.UTF-8/<a href="http://tcsh.cat" rel="noreferrer" target="_blank">tcsh.cat</a><br> .endif<br> <br> .if ${MK_TELNET} == no<br> -OLD_FILES+=etc/pam.d/telnetd<br> OLD_FILES+=usr/bin/telnet<br> -OLD_FILES+=usr/libexec/telnetd<br> OLD_FILES+=usr/share/man/man1/telnet.1.gz<br> -OLD_FILES+=usr/share/man/man8/telnetd.8.gz<br> .endif<br> <br> .if ${MK_TESTS} == yes<br> </blockquote></div>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGMYy3ujZiGZg=x5H_c4HmPbLCQJXJ2dk9ET1VOWqKhDLSLKEQ>