The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=54ce6b2c4c163d85b2a8804edbac69d4e8cb3355
commit 54ce6b2c4c163d85b2a8804edbac69d4e8cb3355 Author: Simon Wollwage <[email protected]> AuthorDate: 2025-12-15 06:27:19 +0000 Commit: Warner Losh <[email protected]> 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 [email protected] 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 <<EOF default:\\ :passwd_format=md5:\\ - :copyright=/etc/COPYRIGHT EOF cat > $TEST/etc/login.conf <<EOF default:\\ @@ -247,7 +246,6 @@ echo "Checking 'r':" cat > $CONFLICTS/etc/login.conf <<EOF default:\\ :passwd_format=md5:\\ - :copyright=/etc/COPYRIGHT\\ :welcome=/etc/motd: EOF diff --git a/usr.sbin/etcupdate/tests/tests_test.sh b/usr.sbin/etcupdate/tests/tests_test.sh index 794be8065a96..71c78869e89e 100644 --- a/usr.sbin/etcupdate/tests/tests_test.sh +++ b/usr.sbin/etcupdate/tests/tests_test.sh @@ -596,7 +596,6 @@ EOF cat > $NEW/etc/login.conf <<EOF default:\\ :passwd_format=md5:\\ - :copyright=/etc/COPYRIGHT EOF cp $OLD/etc/login.conf $TEST/etc/login.conf
