emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* src/su.c: After prepare_pam_close_session() there is no need to

Browse Source 
close the session in the child. Added pam_setcred to
	prepare_pam_close_session().
This commit is contained in:
nekral-guest 2011-06-13 18:27:46 +00:00
parent 1340beed16
commit 317939e821
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -8,6 +8,9 @@
* src/su.c: Also drop the controlling terminal when PAM is not * src/su.c: Also drop the controlling terminal when PAM is not
used. used.
* src/su.c: Remove run_shell(). * src/su.c: Remove run_shell().
* src/su.c: After prepare_pam_close_session() there is no need to
close the session in the child. Added pam_setcred to
prepare_pam_close_session().
2011-06-12 Nicolas François <nicolas.francois@centraliens.net> 2011-06-12 Nicolas François <nicolas.francois@centraliens.net>

8
src/su.c
View File

@ -376,11 +376,10 @@ static void prepare_pam_close_session (void)
SYSLOG ((LOG_ERR, "pam_close_session: %s", SYSLOG ((LOG_ERR, "pam_close_session: %s",
pam_strerror (pamh, ret))); pam_strerror (pamh, ret)));
fprintf (stderr, _("%s: %s\n"), Prog, pam_strerror (pamh, ret)); fprintf (stderr, _("%s: %s\n"), Prog, pam_strerror (pamh, ret));
(void) pam_end (pamh, ret);
exit (1);
} }
ret = pam_end (pamh, PAM_SUCCESS); (void) pam_setcred (pamh, PAM_DELETE_CRED);
(void) pam_end (pamh, PAM_SUCCESS);
if (0 != caught) { if (0 != caught) {
(void) signal (SIGALRM, kill_child); (void) signal (SIGALRM, kill_child);
@ -1016,9 +1015,6 @@ int main (int argc, char **argv)
/* become the new user */ /* become the new user */
if (change_uid (pw) != 0) { if (change_uid (pw) != 0) {
pam_close_session (pamh, 0);
pam_setcred (pamh, PAM_DELETE_CRED);
(void) pam_end (pamh, PAM_ABORT);
exit (1); exit (1);
} }
#else /* !USE_PAM */ #else /* !USE_PAM */