Date: Wed, 12 Feb 2020 02:04:03 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r357789 - in stable: 11/etc 11/lib/libutil 12/lib/libutil 12/usr.bin/login Message-ID: <202002120204.01C243gn054369@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Wed Feb 12 02:04:03 2020 New Revision: 357789 URL: https://svnweb.freebsd.org/changeset/base/357789 Log: MFC r357560, r357707: login.conf(5) mail capability r357560: login.conf(5): split MAIL env var out into a "mail" capability This allows it to be easily suppressed in, e.g., the "daemon" class where it will not be properly expanded. This is a part of D21481. Submitted by: Andrew Gierth <andrew_tao173.riddles.org.uk> r357707: login.conf(5): update commented-out standard, too MAIL now has a mail capability, instead, as of r357560. Modified: stable/11/etc/login.conf stable/11/lib/libutil/login.conf.5 stable/11/lib/libutil/login_class.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/12/lib/libutil/login.conf.5 stable/12/lib/libutil/login_class.c stable/12/usr.bin/login/login.conf Directory Properties: stable/12/ (props changed) Modified: stable/11/etc/login.conf ============================================================================== --- stable/11/etc/login.conf Wed Feb 12 00:58:17 2020 (r357788) +++ stable/11/etc/login.conf Wed Feb 12 02:04:03 2020 (r357789) @@ -26,7 +26,8 @@ default:\ :passwd_format=sha512:\ :copyright=/etc/COPYRIGHT:\ :welcome=/etc/motd:\ - :setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\ + :setenv=BLOCKSIZE=K:\ + :mail=/var/mail/$:\ :path=/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/bin:\ :nologin=/var/run/nologin:\ :cputime=unlimited:\ @@ -61,6 +62,7 @@ xuser:\ staff:\ :tc=default: daemon:\ + :mail@:\ :memorylocked=128M:\ :tc=default: news:\ @@ -121,7 +123,8 @@ russian|Russian Users Accounts:\ #standard:\ # :copyright=/etc/COPYRIGHT:\ # :welcome=/etc/motd:\ -# :setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\ +# :setenv=BLOCKSIZE=K:\ +# :mail=/var/mail/$:\ # :path=~/bin /bin /usr/bin /usr/local/bin:\ # :manpath=/usr/share/man /usr/local/man:\ # :nologin=/var/run/nologin:\ Modified: stable/11/lib/libutil/login.conf.5 ============================================================================== --- stable/11/lib/libutil/login.conf.5 Wed Feb 12 00:58:17 2020 (r357788) +++ stable/11/lib/libutil/login.conf.5 Wed Feb 12 02:04:03 2020 (r357789) @@ -19,7 +19,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 8, 2011 +.Dd January 19, 2020 .Dt LOGIN.CONF 5 .Os .Sh NAME @@ -237,6 +237,7 @@ for details. .It "label string Default MAC policy; see" .Xr maclabel 7 . .It "lang string Set $LANG environment variable to the specified value." +.It "mail string Set $MAIL environment variable to the specified value." .It "manpath path Default search path for manpages." .It "nocheckmail bool false Display mail status at login." .It "nologin file If the file exists it will be displayed and" Modified: stable/11/lib/libutil/login_class.c ============================================================================== --- stable/11/lib/libutil/login_class.c Wed Feb 12 00:58:17 2020 (r357788) +++ stable/11/lib/libutil/login_class.c Wed Feb 12 02:04:03 2020 (r357789) @@ -132,6 +132,7 @@ static struct login_vars { }, envars[] = { { "lang", "LANG", NULL, 1}, { "charset", "MM_CHARSET", NULL, 1}, + { "mail", "MAIL", NULL, 1}, { "timezone", "TZ", NULL, 1}, { "term", "TERM", NULL, 0}, { NULL, NULL, NULL, 0}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002120204.01C243gn054369>