diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2020-02-05 04:17:14 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2020-02-05 04:17:14 +0000 |
| commit | acf2957e49f798b82c130cbf6e4e5ef986911bba (patch) | |
| tree | ff841843adb5236ae55a3ff29d97cd9179c2770b /lib/libutil | |
| parent | f71291a65edabf05123ac95754778ec67717a463 (diff) | |
| download | src-acf2957e49f798b82c130cbf6e4e5ef986911bba.tar.gz src-acf2957e49f798b82c130cbf6e4e5ef986911bba.zip | |
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>
Notes
Notes:
svn path=/head/; revision=357560
Diffstat (limited to 'lib/libutil')
| -rw-r--r-- | lib/libutil/login.conf.5 | 3 | ||||
| -rw-r--r-- | lib/libutil/login_class.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5 index 1c3cfee02e74..47b0daf91c0d 100644 --- a/lib/libutil/login.conf.5 +++ b/lib/libutil/login.conf.5 @@ -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" diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index 532b2bed3059..fd0b232d0a43 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -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} |