From a9f5bfb3a5324f09a07657a8bb28bb4510485d31 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 20 Apr 2010 21:45:33 +1000 Subject: util-runcmd: ignore spurious ECHILD errors when we get ECHILD in samba_runcmd it is because the parent has set SIGCHLD to SIG_IGN. In that case the child status information is lost. We then have to fallback on the logging of child error messages for any useful information on what happened to the child. A longer term fix is to stop using SIG_IGN for SIGCHLD in the standard process model of s4. --- lib/util/util_runcmd.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'lib') diff --git a/lib/util/util_runcmd.c b/lib/util/util_runcmd.c index d81a0ace93..aa2a3e6672 100644 --- a/lib/util/util_runcmd.c +++ b/lib/util/util_runcmd.c @@ -241,6 +241,20 @@ static void samba_runcmd_io_handler(struct tevent_context *ev, * stderr, assume its dead */ pid_t pid = waitpid(state->pid, &status, 0); if (pid != state->pid) { + if (errno == ECHILD) { + /* this happens when the + parent has set SIGCHLD to + SIG_IGN. In that case we + can only get error + information for the child + via its logging. We should + stop using SIG_IGN on + SIGCHLD in the standard + process model. + */ + tevent_req_done(req); + return; + } DEBUG(0,("Error in waitpid() for child %s - %s \n", state->arg0, strerror(errno))); if (errno == 0) { -- cgit