diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2004-01-26 20:04:47 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2004-01-26 20:04:47 +0000 |
| commit | 71f4a30d592ab60048b62d355f9e3b2329a4f679 (patch) | |
| tree | 5d63bd29877c497ed3442d3d2ed12d82bd6f2337 /usr.bin | |
| parent | 96300f5dc8639e7c317bd79254c0d0a26f937562 (diff) | |
| download | src-71f4a30d592ab60048b62d355f9e3b2329a4f679.tar.gz src-71f4a30d592ab60048b62d355f9e3b2329a4f679.zip | |
Fix ~/.hushlogin handling.
PR: 61354
Submitted by: Eugeny Grosbein <eugen (at) kuzbass.ru>
Notes
Notes:
svn path=/head/; revision=125055
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/login/login.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c index 11202588b887..9c06e437a3f5 100644 --- a/usr.bin/login/login.c +++ b/usr.bin/login/login.c @@ -356,8 +356,6 @@ main(int argc, char *argv[]) lc = login_getpwclass(pwd); quietlog = login_getcapbool(lc, "hushlogin", 0); - if (!quietlog) - pam_silent = 0; /* * Switching needed for NFS with root access disabled. @@ -383,8 +381,11 @@ main(int argc, char *argv[]) } (void)seteuid(euid); (void)setegid(egid); - if (!quietlog) + if (!quietlog) { quietlog = access(_PATH_HUSHLOGIN, F_OK) == 0; + if (!quietlog) + pam_silent = 0; + } shell = login_getcapstr(lc, "shell", pwd->pw_shell, pwd->pw_shell); if (*pwd->pw_shell == '\0') |