isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If we get a signal other than SIGCHLD in the monitor, pass it directly

Browse Source 
to the child.
This commit is contained in:
Todd C. Miller
2011-02-02 13:27:24 -05:00
parent c18468d1a5
commit 8a64a8c798
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/exec_pty.c
View File

@@ -943,7 +943,6 @@ exec_monitor(struct command_details *details, char *argv[], char *envp[],
} }
if (FD_ISSET(signal_pipe[0], fdsr)) { if (FD_ISSET(signal_pipe[0], fdsr)) {
/* Read child status. */
n = read(signal_pipe[0], &signo, sizeof(signo)); n = read(signal_pipe[0], &signo, sizeof(signo));
if (n == -1) { if (n == -1) {
if (errno == EINTR || errno == EAGAIN) if (errno == EINTR || errno == EAGAIN)
@@ -951,12 +950,16 @@ exec_monitor(struct command_details *details, char *argv[], char *envp[],
warning("error reading from signal pipe"); warning("error reading from signal pipe");
goto done; goto done;
} }
/* We should only ever get SIGCHLD. */ /*
if (signo == SIGCHLD) { * Handle SIGCHLD specially and deliver other signals
* directly to the child.
*/
if (signo == SIGCHLD)
alive = handle_sigchld(backchannel, &cstat); alive = handle_sigchld(backchannel, &cstat);
else
deliver_signal(child, signo);
continue; continue;
} }
}
if (errpipe[0] != -1 && FD_ISSET(errpipe[0], fdsr)) { if (errpipe[0] != -1 && FD_ISSET(errpipe[0], fdsr)) {
/* read errno or EOF from command pipe */ /* read errno or EOF from command pipe */
n = read(errpipe[0], &cstat, sizeof(cstat)); n = read(errpipe[0], &cstat, sizeof(cstat));