diff options
| author | Maxim Konovalov <maxim@FreeBSD.org> | 2005-06-01 12:23:06 +0000 |
|---|---|---|
| committer | Maxim Konovalov <maxim@FreeBSD.org> | 2005-06-01 12:23:06 +0000 |
| commit | 42dc3715bbd8fccb86645ab5cc7bcbfd7a5a53b0 (patch) | |
| tree | 790e4dc8cfee1b2a73b259b566201529bf7dbfb9 /usr.bin/login | |
| parent | 303939942c22338c4661a56dd0fae27a6aaccde6 (diff) | |
Notes
Diffstat (limited to 'usr.bin/login')
| -rw-r--r-- | usr.bin/login/login.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c index 9c06e437a3f5..68693f82e21c 100644 --- a/usr.bin/login/login.c +++ b/usr.bin/login/login.c @@ -171,6 +171,7 @@ main(int argc, char *argv[]) const char *tp; const char *shell = NULL; login_cap_t *lc = NULL; + login_cap_t *lc_user = NULL; pid_t pid; (void)signal(SIGQUIT, SIG_IGN); @@ -354,8 +355,10 @@ main(int argc, char *argv[]) * Establish the login class. */ lc = login_getpwclass(pwd); + lc_user = login_getuserclass(pwd); - quietlog = login_getcapbool(lc, "hushlogin", 0); + if (!(quietlog = login_getcapbool(lc_user, "hushlogin", 0))) + quietlog = login_getcapbool(lc, "hushlogin", 0); /* * Switching needed for NFS with root access disabled. @@ -568,7 +571,8 @@ main(int argc, char *argv[]) else motd(_PATH_MOTDFILE); - if (login_getcapbool(lc, "nocheckmail", 0) == 0) { + if (login_getcapbool(lc_user, "nocheckmail", 0) == 0 && + login_getcapbool(lc, "nocheckmail", 0) == 0) { char *cx; /* $MAIL may have been set by class. */ @@ -585,6 +589,7 @@ main(int argc, char *argv[]) } } + login_close(lc_user); login_close(lc); (void)signal(SIGALRM, SIG_DFL); |