From nobody Wed Sep 28 18:54:14 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 4Md5J728kgz4d1NF; Wed, 28 Sep 2022 18:54:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Md5J71crWz432p; Wed, 28 Sep 2022 18:54:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664391255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZvaMKRva41Rrc7IFS29Z1lwGOHvs4/+A4Rki0mzNATY=; b=i95OUBpHAOA0xm785wbz+fy9rikiFhnc+S2ZQE9+r6wjWh4STJYdlQPS5llL7MQtP2MP8G Bq0ceJNc5iEJrdZqghb81yz7APwjRCQlgg9KqZzCK8UJqcwYzy7aUBwrBRtW8QBNLX+ABW eSvLrhk7exlapHT/SayMa+UyNPjTDqjTTcGd9CRgfK6MDXCmJgoXXM5Uz3i41kJrHn/0cV lYF/z1+Y80lrwPSGpIZzrA2r5zSQmzxMTiaKaAZ1FD7pgNTNw+5SrR85j/k21pnMEkB9Mo X8PAiYajalzO0P1R2xjLtn4EGSGfaBVxn3DhIQyyeeLPmWtoVSaTHbQaEH9ktw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Md5J70fDqzZ8w; Wed, 28 Sep 2022 18:54:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28SIsEt0074681; Wed, 28 Sep 2022 18:54:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28SIsEXN074680; Wed, 28 Sep 2022 18:54:14 GMT (envelope-from git) Date: Wed, 28 Sep 2022 18:54:14 GMT Message-Id: <202209281854.28SIsEXN074680@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 0eea46fb1f83 - main - Remove telnetd 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0eea46fb1f83f6091df92b5f2eae993cd6c2c873 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664391255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZvaMKRva41Rrc7IFS29Z1lwGOHvs4/+A4Rki0mzNATY=; b=fldfU/kpbcXpO3vao6+hEzDMWKK/r83R9X5Hka5s2aegYU/VS9sQfMXH8oo5BDteKfkrut 25xrzCsBRhA2IjUY/EUBNogRwNkXhlB5wk39BQKUFTUfW5V81ngjvpeZVPCncRnhsviz6+ vJse2/tyAiG+Ub4K5clei0SV/cLbQjrab2OhstvuDoM4lZck+FXtXwANsb5jehQFKNHYzi 3G3QXk0JX74gtPxaq6QARbFViUJYqiNxn6ur43/7YnlrZ51jPyGXRoqwncpWgb0gVoCg03 eKF8zLLER0zqp7vlMx/gDs3zA/CkV2v5JrdwJjgTJwdbLCRVpatQsD1XRZReyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664391255; a=rsa-sha256; cv=none; b=YTKdtHtvSKLCXmVqOgsC9d6+Pd64W23lb2zLdp+grfzy5CVAqqZAXrG74T6PmnL4RmR1vq Png+AuqP2yvsL9ejvq81lSr5V+XaVTEmIPh3YMGZHiMGcT9btmD+zXkny/bVeHDvPloKBs 6zSrEoN28ua++IcN04YGYJqo279KevRoKfYo3lua1OW/Lz3btk5NUw69Z1wmacsROTB6dj DSRm1gVg5enVnvW+JUs9qEQhal7Zn5V2dJqZc2fIvr6F7OThr8vRI3XITg0iFpSpOhcI15 nnBsW5Df5Bw6XfVwzg1U6iPLlNgVoYJoDy3cC7E7L8JshRSzSMsQYExtFlkTFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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