From nobody Wed Sep 28 20:54:46 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Md7zT6zgsz4V3ZT; Wed, 28 Sep 2022 20:55:01 +0000 (UTC) (envelope-from delphij@gmail.com) Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Md7zS6F74z493y; Wed, 28 Sep 2022 20:55:00 +0000 (UTC) (envelope-from delphij@gmail.com) Received: by mail-ej1-x62f.google.com with SMTP id 13so29614834ejn.3; Wed, 28 Sep 2022 13:55:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=s0L62uZ6c4t52ojYaaw3KSk11HKqNBOmf0XVYLO7JNI=; b=azP6fJ+QQqM7RiTNSrpDASceM6qnNl3GIoVsmAODtm/ogrRpn5ykhyx5exw0qJEjpV EFMCKrUidh3++xoDfrYR1jn7VkVI/bAFZXlsFFnSQOlq7LY/1DKq1TIP1g4AS62LtiUz rudm47uRezvJmKmOaUYWmJDDA4+0A0WDd8RHW5OzudUg78slqls1xUzRZi6V0TN/uAPH lhj1vA62u+gvTNODiMwfj9PYYswDFxdmdpH5TAxKI/O29LXUHIUG0Zys58/zbGChm/65 Wq0LTgZQPPOngLRkhUO47aNoumyGyjqVmThQnQsytKKAqOQdb1Ag2W2BsmzuR20QWPGD A/Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=s0L62uZ6c4t52ojYaaw3KSk11HKqNBOmf0XVYLO7JNI=; b=S4Oty/JyJHzTZ2Yrm77ssSTiQm+BzFCOG6vySNHRkCgK0Q3eFfY+yHUwH2T9YFsguN LKiuU0Y3ojaKNpm/rsO5Zv+G6c55+ZDzjCFWIiqoNfSFOZpPVucFJYUXUX6lA6GdAw4r E56ajnBmIeh+3zmW4xaeMD9tnDrvRuEc9BE8LFScAPnkjln+I7h94Oo67s2n5j0adWzM lI1DsJXaAF2idwVf/Nr7lMlm0lGxWcPUeXDxmXx6z8Q5SFQt8X36vqrGaO8yNNFffsS4 LAdl4Bv2ox83I/iofaNjLFQZf92HjMQ18AfqFcnZatgwNxejmP80tIQ9EpOzKIZoYnC4 yMhQ== X-Gm-Message-State: ACrzQf3u0GXY//1txE0D/cw5ecwdQq4MBe11Q8bfaLFiYZXV56c4UDje w34njpJZoVTuegyXSosJV4sFHCuFkoRzAvjJkXzbdlqb X-Google-Smtp-Source: AMsMyM5jsGVecpzGLvrA08/cE5aoIJ4R9YKUhclBRf+wPkiFqaniL2NKJqgmoxr8wFUTRupLRMWIiHmZJiCKTCnm5h8= X-Received: by 2002:a17:907:2721:b0:77c:29f9:2c84 with SMTP id d1-20020a170907272100b0077c29f92c84mr29860178ejl.721.1664398498743; Wed, 28 Sep 2022 13:54:58 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202209281854.28SIsEXN074680@gitrepo.freebsd.org> In-Reply-To: <202209281854.28SIsEXN074680@gitrepo.freebsd.org> From: Xin LI Date: Wed, 28 Sep 2022 13:54:46 -0700 Message-ID: Subject: Re: git: 0eea46fb1f83 - main - Remove telnetd To: Brooks Davis Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000484d1805e9c2f94a" X-Rspamd-Queue-Id: 4Md7zS6F74z493y X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=azP6fJ+Q; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of delphij@gmail.com designates 2a00:1450:4864:20::62f as permitted sender) smtp.mailfrom=delphij@gmail.com X-Spamd-Result: default: False [-4.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.996]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::62f:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[delphij]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-ThisMailContainsUnwantedMimeParts: N --000000000000484d1805e9c2f94a Content-Type: text/plain; charset="UTF-8" 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 wrote: > The branch main has been updated by brooks: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=0eea46fb1f83f6091df92b5f2eae993cd6c2c873 > > commit 0eea46fb1f83f6091df92b5f2eae993cd6c2c873 > Author: Brooks Davis > AuthorDate: 2022-09-28 18:53:10 +0000 > Commit: Brooks Davis > 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 > 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 > - > -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 > 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 > - > -.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 > 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 > --000000000000484d1805e9c2f94a Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
This removal is incomplete.=C2=A0 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@fre= ebsd.org> wrote:
The branch main has been updated by brooks:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3D0eea46fb1f83f6091df92b5f2eae993cd6c2c873
commit 0eea46fb1f83f6091df92b5f2eae993cd6c2c873
Author:=C2=A0 =C2=A0 =C2=A0Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2022-09-28 18:53:10 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2022-09-28 18:53:49 +0000

=C2=A0 =C2=A0 Remove telnetd

=C2=A0 =C2=A0 The telnetd codebase is unmaintained and has a number of qual= ity
=C2=A0 =C2=A0 issues. Telnet has been largely supplanted by ssh. If needed,= a port is
=C2=A0 =C2=A0 available (net/freebsd-telnetd), but a more maintained implem= entation
=C2=A0 =C2=A0 should be prefered.

=C2=A0 =C2=A0 While the telnet client suffers from the same issues, it is d= eemed
=C2=A0 =C2=A0 to be of lower risk and is required to connect to legacy devi= ces, so
=C2=A0 =C2=A0 it remains.

=C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 emaste, imp
=C2=A0 =C2=A0 Differential Revision:=C2=A0 https://reviews.freebsd= .org/D36620
---
=C2=A0ObsoleteFiles.inc=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 5 ++++
=C2=A0lib/libpam/pam.d/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 |=C2=A0 6 -----
=C2=A0lib/libpam/pam.d/telnetd=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0| 26 ------------------
=C2=A0libexec/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 5 ----
=C2=A0libexec/telnetd/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0| 45 --------------------------------
=C2=A0libexec/telnetd/Makefile.depend=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 2= 5 ------------------
=C2=A0libexec/telnetd/Makefile.depend.options=C2=A0 |=C2=A0 6 -----
=C2=A0tools/build/mk/OptionalObsoleteFiles.inc |=C2=A0 3 ---
=C2=A08 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 @@
=C2=A0#=C2=A0 =C2=A0xargs -n1 | sort | uniq -d;
=C2=A0# 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
+
=C2=A0# 20220914: domain(9) updated
=C2=A0OLD_FILES+=3Dusr/share/man/man9/domain_init.9.gz
=C2=A0OLD_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:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${CONFDIR= }/ftpd ${DESTDIR}${CONFDIR}/ftp
=C2=A0.endif

-.if ${MK_TELNET} !=3D "no"
-CONFGROUPS+=3D=C2=A0 =C2=A0TELNET
-TELNET+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0telnetd
-TELNETPACKAGE=3D telnet
-.endif
-
=C2=A0.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=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0sufficient=C2=A0 =C2=A0 =C2= =A0 pam_opie.so=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0no_warn no_f= ake_prompts
-auth=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0requisite=C2=A0 =C2=A0 =C2=A0= =C2=A0pam_opieaccess.so=C2=A0 =C2=A0 =C2=A0 =C2=A0no_warn allow_local
-#auth=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 sufficient=C2=A0 =C2=A0 =C2=A0 pam= _krb5.so=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0no_warn try_first_p= ass
-#auth=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 sufficient=C2=A0 =C2=A0 =C2=A0 pam= _ssh.so=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 no_warn try_first_p= ass
-auth=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0required=C2=A0 =C2=A0 =C2=A0 = =C2=A0 pam_unix.so=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0no_warn t= ry_first_pass
-
-# account
-account=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 required=C2= =A0 =C2=A0 =C2=A0 =C2=A0 pam_nologin.so
-#account=C2=A0 =C2=A0 =C2=A0 =C2=A0required=C2=A0 =C2=A0 =C2=A0 =C2=A0 pam= _krb5.so
-account=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 required=C2= =A0 =C2=A0 =C2=A0 =C2=A0 pam_login_access.so
-account=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 required=C2= =A0 =C2=A0 =C2=A0 =C2=A0 pam_unix.so
-
-# session
-#session=C2=A0 =C2=A0 =C2=A0 =C2=A0optional=C2=A0 =C2=A0 =C2=A0 =C2=A0 pam= _ssh.so=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 want_agent
-session=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 required=C2= =A0 =C2=A0 =C2=A0 =C2=A0 pam_lastlog.so=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 n= o_fail
-
-# password
-#password=C2=A0 =C2=A0 =C2=A0 sufficient=C2=A0 =C2=A0 =C2=A0 pam_krb5.so= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0no_warn try_first_pass
-password=C2=A0 =C2=A0 =C2=A0 =C2=A0required=C2=A0 =C2=A0 =C2=A0 =C2=A0 pam= _unix.so=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0no_warn try_first_p= ass
diff --git a/libexec/Makefile b/libexec/Makefile
index 1b41ae81565c..8d7565fe3ee5 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -27,7 +27,6 @@ SUBDIR=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0${_atf} \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${_rtld-elf} \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 save-entropy \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${_smrsh} \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0${_telnetd} \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${_tests} \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${_tftp-proxy} \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ulog-helper \
@@ -104,10 +103,6 @@ SUBDIR+=3D=C2=A0 =C2=A0talkd
=C2=A0SUBDIR+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0tcpd
=C2=A0.endif

-.if ${MK_TELNET} !=3D "no"
-_telnetd=3D=C2=A0 =C2=A0 =C2=A0 telnetd
-.endif
-
=C2=A0.if ${MK_TFTP} !=3D "no"
=C2=A0SUBDIR+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0tftpd
=C2=A0.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=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0telnet
-
-TELNETDIR=3D=C2=A0 =C2=A0 =C2=A0${SRCTOP}/contrib/telnet
-.PATH:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${TELNETDIR}/telnetd
-
-PROG=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 telnetd
-MAN=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0telnetd.8
-
-SRCS=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 global.c slc.c state.c sys_term.= c telnetd.c \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0termstat.c utility.= c
-
-WARNS?=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 2
-WFORMAT?=3D=C2=A0 =C2=A0 =C2=A0 0
-
-CFLAGS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS= -DOLD_ENVIRON \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-DENV_HACK -DSTREAM= SPTY
-
-.if ${MK_INET6_SUPPORT} !=3D "no"
-CFLAGS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0-DINET6
-.endif
-
-CFLAGS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0-I${TELNETDIR}
-CFLAGS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0-I${TELNETDIR}/telnet
-
-LIBADD=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 telnet ut= il tinfow
-
-.if ${MK_OPENSSL} !=3D "no"
-SRCS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0authenc.c
-CFLAGS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0-DAUTHENTICATION -DENCRYPTION
-LIBADD+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0mp crypto pam
-.endif
-
-.if ${MK_KERBEROS_SUPPORT} !=3D "no"
-CFLAGS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0-DKRB5 -DFORWARD -Dnet_write=3Dtelnet= _net_write
-LIBADD+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0krb5 roken
-.endif
-
-.include <bsd.prog.mk>
diff --git a/libexec/telnetd/Makefile.depend b/libexec/telnetd/Makefile.dep= end
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 \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0include \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0include/arpa \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0include/xlocale \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0lib/${CSU_DIR} \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0lib/libc \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0lib/libcom_err \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0lib/libcompiler_rt \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0lib/libcrypt \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0lib/libmp \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0lib/libpam/libpam \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0lib/libtelnet \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0lib/libthr \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0lib/libutil \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0lib/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/Make= file.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/Opti= onalObsoleteFiles.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
=C2=A0.endif

=C2=A0.if ${MK_TELNET} =3D=3D no
-OLD_FILES+=3Detc/pam.d/telnetd
=C2=A0OLD_FILES+=3Dusr/bin/telnet
-OLD_FILES+=3Dusr/libexec/telnetd
=C2=A0OLD_FILES+=3Dusr/share/man/man1/telnet.1.gz
-OLD_FILES+=3Dusr/share/man/man8/telnetd.8.gz
=C2=A0.endif

=C2=A0.if ${MK_TESTS} =3D=3D yes
--000000000000484d1805e9c2f94a--