summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr.bin/login/login.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 1120258..9c06e43 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')
OpenPOWER on IntegriCloud