Date: Wed, 28 Sep 2022 23:10:43 +0000 From: Brooks Davis <brooks@freebsd.org> To: Xin LI <delphij@gmail.com> Cc: Brooks Davis <brooks@freebsd.org>, 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: <20220928231043.GA79265@spindle.one-eyed-alien.net> In-Reply-To: <CAGMYy3ujZiGZg=x5H_c4HmPbLCQJXJ2dk9ET1VOWqKhDLSLKEQ@mail.gmail.com> References: <202209281854.28SIsEXN074680@gitrepo.freebsd.org> <CAGMYy3ujZiGZg=x5H_c4HmPbLCQJXJ2dk9ET1VOWqKhDLSLKEQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--C7zPtVaVf+AK4Oqc Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable For the list, there's a review stack beginning here: https://reviews.freebsd.org/D36782 Thanks, Brooks On Wed, Sep 28, 2022 at 01:54:46PM -0700, Xin LI wrote: > 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? >=20 > On Wed, Sep 28, 2022 at 11:54 AM Brooks Davis <brooks@freebsd.org> wrote: >=20 > > The branch main has been updated by brooks: > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=3D0eea46fb1f83f6091df92b5f2eae9= 93cd6c2c873 > > > > 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 por= t is > > available (net/freebsd-telnetd), but a more maintained implementati= on > > 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+=3Detc/pam.d/telnetd > > +OLD_FILES+=3Dusr/libexec/telnetd > > +OLD_FILES+=3Dusr/share/man/man8/telnetd.8.gz > > + > > # 20220914: domain(9) updated > > OLD_FILES+=3Dusr/share/man/man9/domain_init.9.gz > > OLD_FILES+=3Dusr/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} !=3D "no" > > -CONFGROUPS+=3D TELNET > > -TELNET+=3D telnetd > > -TELNETPACKAGE=3D 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_l= ocal > > -#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=3D ${_atf} \ > > ${_rtld-elf} \ > > save-entropy \ > > ${_smrsh} \ > > - ${_telnetd} \ > > ${_tests} \ > > ${_tftp-proxy} \ > > ulog-helper \ > > @@ -104,10 +103,6 @@ SUBDIR+=3D talkd > > SUBDIR+=3D tcpd > > .endif > > > > -.if ${MK_TELNET} !=3D "no" > > -_telnetd=3D telnetd > > -.endif > > - > > .if ${MK_TFTP} !=3D "no" > > SUBDIR+=3D 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 ma= ny > > -# telnet implementations. > > - > > -.include <src.opts.mk> > > - > > -PACKAGE=3D telnet > > - > > -TELNETDIR=3D ${SRCTOP}/contrib/telnet > > -.PATH: ${TELNETDIR}/telnetd > > - > > -PROG=3D telnetd > > -MAN=3D telnetd.8 > > - > > -SRCS=3D global.c slc.c state.c sys_term.c telnetd.c \ > > - termstat.c utility.c > > - > > -WARNS?=3D 2 > > -WFORMAT?=3D 0 > > - > > -CFLAGS+=3D -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \ > > - -DENV_HACK -DSTREAMSPTY > > - > > -.if ${MK_INET6_SUPPORT} !=3D "no" > > -CFLAGS+=3D -DINET6 > > -.endif > > - > > -CFLAGS+=3D -I${TELNETDIR} > > -CFLAGS+=3D -I${TELNETDIR}/telnet > > - > > -LIBADD=3D telnet util tinfow > > - > > -.if ${MK_OPENSSL} !=3D "no" > > -SRCS+=3D authenc.c > > -CFLAGS+=3D -DAUTHENTICATION -DENCRYPTION > > -LIBADD+=3D mp crypto pam > > -.endif > > - > > -.if ${MK_KERBEROS_SUPPORT} !=3D "no" > > -CFLAGS+=3D -DKRB5 -DFORWARD -Dnet_write=3Dtelnet_net_write > > -LIBADD+=3D 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 =3D \ > > - 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} =3D=3D ${_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=3D 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+=3Dusr/share/nls/uk_UA.UTF-8/tcsh.cat > > .endif > > > > .if ${MK_TELNET} =3D=3D no > > -OLD_FILES+=3Detc/pam.d/telnetd > > OLD_FILES+=3Dusr/bin/telnet > > -OLD_FILES+=3Dusr/libexec/telnetd > > OLD_FILES+=3Dusr/share/man/man1/telnet.1.gz > > -OLD_FILES+=3Dusr/share/man/man8/telnetd.8.gz > > .endif > > > > .if ${MK_TESTS} =3D=3D yes > > --C7zPtVaVf+AK4Oqc Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJjNNRyAAoJEKzQXbSebgfA0dUH/0o+hodRfEDM+094Dvvfo67O 1DoYlUm8FIYqT6nPSo/JlKryR06uRbdgMujnc6XSNnAPNX3tU+x1bG8ttI3WWJXL RKIifAi5PLNn87SMAHdq9E0WLw/ZjsLBQArHv8t0FbCQFPQqmzj8Ue4TSpOiZhyA 7lEOikIC8eNLr3kBUA4JIwQxNRezHOqGmU/UX2VUYhvNy83q9pxNbf5x0cBJFFRT /c2vytkBGDCu3vpLmzEEzP7ecpdsRH4nEkjSsIkK7IfTr6zs2+gP5baqnhfJUfMx kcz63ukQOijIkXDowwx+faRBh7yq0Ap3vaILMqf5+AubruN4+MqHEdj5mgpuTCY= =9kKw -----END PGP SIGNATURE----- --C7zPtVaVf+AK4Oqc--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20220928231043.GA79265>