emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

login: close PAM session on errors as well, not only on success

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2019-01-22 17:00:14 +01:00
parent 414be6c111
commit db5a6daa7f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
loginutils/login.c
View File

@ -245,7 +245,9 @@ static void login_pam_end(pam_handle_t *pamh)
pam_strerror(pamh, pamret), pamret); pam_strerror(pamh, pamret), pamret);
} }
} }
#endif /* ENABLE_PAM */ #else
# define login_pam_end(pamh) ((void)0)
#endif
static void get_username_or_die(char *buf, int size_buf) static void get_username_or_die(char *buf, int size_buf)
{ {
@ -471,6 +473,7 @@ int login_main(int argc UNUSED_PARAM, char **argv)
* to know _why_ login failed */ * to know _why_ login failed */
syslog(LOG_WARNING, "pam_%s call failed: %s (%d)", failed_msg, syslog(LOG_WARNING, "pam_%s call failed: %s (%d)", failed_msg,
pam_strerror(pamh, pamret), pamret); pam_strerror(pamh, pamret), pamret);
login_pam_end(pamh);
safe_strncpy(username, "UNKNOWN", sizeof(username)); safe_strncpy(username, "UNKNOWN", sizeof(username));
#else /* not PAM */ #else /* not PAM */
pw = getpwnam(username); pw = getpwnam(username);
@ -528,8 +531,7 @@ int login_main(int argc UNUSED_PARAM, char **argv)
if (child_pid < 0) if (child_pid < 0)
bb_perror_msg("vfork"); bb_perror_msg("vfork");
else { else {
if (safe_waitpid(child_pid, NULL, 0) == -1) wait_for_exitstatus(child_pid);
bb_perror_msg("waitpid");
update_utmp_DEAD_PROCESS(child_pid); update_utmp_DEAD_PROCESS(child_pid);
} }
IF_PAM(login_pam_end(pamh);) IF_PAM(login_pam_end(pamh);)