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

Merge pull request #456 from stoeckmann/chld

Browse Source 
Verify default SIGCHLD handling.
This commit is contained in:
Serge Hallyn 2021-12-15 09:22:19 -06:00 committed by GitHub
commit a850520981
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/su.c
View File

@ -295,6 +295,21 @@ static void prepare_pam_close_session (void)
sigset_t ourset; sigset_t ourset;
int status; int status;
int ret; int ret;
struct sigaction action;
/* reset SIGCHLD handling to default */
action.sa_handler = SIG_DFL;
sigemptyset (&action.sa_mask);
action.sa_flags = 0;
if (0 == caught && sigaction (SIGCHLD, &action, NULL) != 0) {
fprintf (stderr,
_("%s: signal masking malfunction\n"),
Prog);
SYSLOG ((LOG_WARN, "Will not execute %s", shellstr));
closelog ();
exit (1);
/* Only the child returns. See above. */
}
pid_child = fork (); pid_child = fork ();
if (pid_child == 0) { /* child shell */ if (pid_child == 0) { /* child shell */
@ -318,11 +333,7 @@ static void prepare_pam_close_session (void)
caught = SIGTERM; caught = SIGTERM;
} }
if (0 == caught) { if (0 == caught) {
struct sigaction action;
action.sa_handler = catch_signals; action.sa_handler = catch_signals;
sigemptyset (&action.sa_mask);
action.sa_flags = 0;
sigemptyset (&ourset); sigemptyset (&ourset);
if ( (sigaddset (&ourset, SIGTERM) != 0) if ( (sigaddset (&ourset, SIGTERM) != 0)