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>
This commit is contained in:
Kyle Evans
2020-02-05 04:17:14 +00:00
parent f71291a65e
commit acf2957e49
3 changed files with 6 additions and 2 deletions
+2 -1
View File
@@ -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"
+1
View File
@@ -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}
+3 -1
View File
@@ -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:\