Date: Wed, 5 Feb 2020 04:17:15 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357560 - in head: lib/libutil usr.bin/login Message-ID: <202002050417.0154HFgE072867@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Wed Feb 5 04:17:14 2020 New Revision: 357560 URL: https://svnweb.freebsd.org/changeset/base/357560 Log: 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> Modified: head/lib/libutil/login.conf.5 head/lib/libutil/login_class.c head/usr.bin/login/login.conf Modified: head/lib/libutil/login.conf.5 ============================================================================== --- head/lib/libutil/login.conf.5 Wed Feb 5 03:07:20 2020 (r357559) +++ head/lib/libutil/login.conf.5 Wed Feb 5 04:17:14 2020 (r357560) @@ -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: head/lib/libutil/login_class.c ============================================================================== --- head/lib/libutil/login_class.c Wed Feb 5 03:07:20 2020 (r357559) +++ head/lib/libutil/login_class.c Wed Feb 5 04:17:14 2020 (r357560) @@ -131,6 +131,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} Modified: head/usr.bin/login/login.conf ============================================================================== --- head/usr.bin/login/login.conf Wed Feb 5 03:07:20 2020 (r357559) +++ head/usr.bin/login/login.conf Wed Feb 5 04:17:14 2020 (r357560) @@ -26,7 +26,8 @@ default:\ :passwd_format=sha512:\ :copyright=/etc/COPYRIGHT:\ :welcome=/var/run/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:\
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002050417.0154HFgE072867>