From nobody Fri Jan 9 21:25:41 2026 X-Original-To: dev-commits-src-main@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 4dnvvV20Hxz6MNkW for ; Fri, 09 Jan 2026 21:25:42 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dnvvT6Rkqz3XYq for ; Fri, 09 Jan 2026 21:25:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767993941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1llS0rwF0bjj62I5QcfCkJA8RJW4SmEUZx58pxKHwZg=; b=Ja0him8udOs650Pt9XnW85skdP1lAC6McNSXhdNNGoLebdXuFj3Th0vRi6j/Zf8eq14ToU 9L/3KkdEwpl9HP3EnB/c9hs8nsDe/Dqfzx2tT3T6XcUdnnpdOQiLAQeM8zcEA5kbPlWF/o tptzr4Fclhzfnm8b2NsB6+bZbtcqP055Mv8BmyhnKL2LLuknpkZukoSPa2AIZfCol9Ab3n z+V6M2I3/E5iyK/ZMGjfzjpXOrACX3/zpcw8qp/m7lttJ3t+sIKXHaSg9aOeQQCavEybH3 31fH0UZBP74FOXacEJz/U/icrZ1YvEXYA/K3IHCj/9YOTNzY3rt/CzkoEjC5hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767993941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1llS0rwF0bjj62I5QcfCkJA8RJW4SmEUZx58pxKHwZg=; b=W5VpXQq6v1NoVvn5EcLegtxqw9P1SxOitS7m6H/yOt9OAuHt4q99AgHBnQ0Y7mqirRfI28 DHMATLS+d69blrkVip1cJYH5pgjy8sgcW2ATf+3v/ENv8PEJeXcicfxhW5XR+YIk4J8KI0 59CKNKkNkVJIzZFkSbGwnySiVDNJnkGYApLIn+Oa2sx2Bckrtq91X4UvYZj6yVYxY4zGCA AdDts9Dfl7D5OkSkkV8f2jerT83Gapv0C9JaxyriphJFpeabSA5Yhra2kuNoMNnO3+Zl9A FjlobHXz375QN9AH0t4f9XwrUlKfg5vTMEm4L0UwXHEE6bfQqZR0hCk7N5in2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767993941; a=rsa-sha256; cv=none; b=hSd2GYHSHhiyxpRaEcmDyGLIo1qO2KJEoPN8Bu2xt94K3Itdv3J22wpN/8q0CPVEyPRsJL uutRxwcQ9PwNJ2riKQ14Z3CI7Atw851/FomyiiMCMmWm1nseSXQC13rFziU8SRT0tEgj/5 aDnf/BA+W/lKvte5TNH91MnK5gZaGnpYX/bPGiwVtSQNpHR4ZawJRs43k6f5RAZXV8JKMR HXZJ903UiJFw2+kknlv6wvHbPwbLLrZPFrOdja46Mc2RDvjQ+0nRZSjhAfIzOxtwbOkYJt 5BvpvJ56Eou5BnEqhe+Zlh/iRwvpskHsNvBH/d/rhus5PUUuHA22YCaN//bArw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dnvvT4w4nz9Rj for ; Fri, 09 Jan 2026 21:25:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d27a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Jan 2026 21:25:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Simon Wollwage From: Warner Losh Subject: git: 54ce6b2c4c16 - main - login.conf.5: Remove mention of login copyright setting List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54ce6b2c4c163d85b2a8804edbac69d4e8cb3355 Auto-Submitted: auto-generated Date: Fri, 09 Jan 2026 21:25:41 +0000 Message-Id: <69617255.d27a.53ad621c@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=54ce6b2c4c163d85b2a8804edbac69d4e8cb3355 commit 54ce6b2c4c163d85b2a8804edbac69d4e8cb3355 Author: Simon Wollwage AuthorDate: 2025-12-15 06:27:19 +0000 Commit: Warner Losh CommitDate: 2026-01-09 21:13:37 +0000 login.conf.5: Remove mention of login copyright setting PR: 291649 Fixes: 905571c03119 ("Remove copyright strings printed at login time via login(1) or sshd(8).") Signed-off-by: Simon Wollwage rootnode+freebsd@wollwage.com Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1926 --- lib/libutil/login.conf.5 | 3 +-- usr.bin/login/login.conf | 2 -- usr.sbin/etcupdate/tests/conflicts_test.sh | 2 -- usr.sbin/etcupdate/tests/tests_test.sh | 1 - 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5 index 942f3ecd2661..d4bbc1d67780 100644 --- a/lib/libutil/login.conf.5 +++ b/lib/libutil/login.conf.5 @@ -17,7 +17,7 @@ .\" 5. Modifications may be freely made to this file providing the above .\" conditions are met. .\" -.Dd September 25, 2025 +.Dd December 15, 2025 .Dt LOGIN.CONF 5 .Os .Sh NAME @@ -288,7 +288,6 @@ explicitly indicates not to change the umask. .Bl -column passwd_prompt indent indent .It Sy "Name Type Default Description" .\" .It "approve program Program to approve login. -.It "copyright file File containing additional copyright information" .It "host.allow list List of remote host wildcards from which users in" the class may access. .It "host.deny list List of remote host wildcards from which users" diff --git a/usr.bin/login/login.conf b/usr.bin/login/login.conf index c65a83caa565..267b0f1ad826 100644 --- a/usr.bin/login/login.conf +++ b/usr.bin/login/login.conf @@ -23,7 +23,6 @@ default:\ :passwd_format=sha512:\ - :copyright=/etc/COPYRIGHT:\ :welcome=/var/run/motd:\ :setenv=BLOCKSIZE=K:\ :mail=/var/mail/$:\ @@ -127,7 +126,6 @@ russian|Russian Users Accounts:\ ## standard - standard user defaults ## #standard:\ -# :copyright=/etc/COPYRIGHT:\ # :welcome=/var/run/motd:\ # :setenv=BLOCKSIZE=K:\ # :mail=/var/mail/$:\ diff --git a/usr.sbin/etcupdate/tests/conflicts_test.sh b/usr.sbin/etcupdate/tests/conflicts_test.sh index 87857e7cd0a9..a2ccabaa17ee 100644 --- a/usr.sbin/etcupdate/tests/conflicts_test.sh +++ b/usr.sbin/etcupdate/tests/conflicts_test.sh @@ -80,7 +80,6 @@ EOF cat > $NEW/etc/login.conf < $TEST/etc/login.conf < $CONFLICTS/etc/login.conf < $NEW/etc/login.conf <