diff options
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/child_common.c | 24 | ||||
| -rw-r--r-- | src/util/child_common.h | 8 |
2 files changed, 30 insertions, 2 deletions
diff --git a/src/util/child_common.c b/src/util/child_common.c index 5f0b26595..fe4684fb0 100644 --- a/src/util/child_common.c +++ b/src/util/child_common.c @@ -260,7 +260,8 @@ struct sss_child_ctx_old { }; int child_handler_setup(struct tevent_context *ev, int pid, - sss_child_callback_t cb, void *pvt) + sss_child_callback_t cb, void *pvt, + struct sss_child_ctx_old **_child_ctx) { struct sss_child_ctx_old *child_ctx; @@ -284,9 +285,30 @@ int child_handler_setup(struct tevent_context *ev, int pid, child_ctx->pvt = pvt; DEBUG(8, ("Signal handler set up for pid [%d]\n", pid)); + + if (_child_ctx != NULL) { + *_child_ctx = child_ctx; + } + return EOK; } +void child_handler_destroy(struct sss_child_ctx_old *ctx) +{ + errno_t ret; + + /* We still want to wait for the child to finish, but the caller is not + * interested in the result anymore (e.g. timeout was reached). */ + ctx->cb = NULL; + ctx->pvt = NULL; + + ret = kill(ctx->pid, SIGKILL); + if (ret == -1) { + ret = errno; + DEBUG(SSSDBG_MINOR_FAILURE, ("kill failed [%d][%s].\n", ret, strerror(ret))); + } +} + /* Async communication with the child process via a pipe */ struct write_pipe_state { diff --git a/src/util/child_common.h b/src/util/child_common.h index 237969f2f..95865bb52 100644 --- a/src/util/child_common.h +++ b/src/util/child_common.h @@ -78,9 +78,15 @@ typedef void (*sss_child_callback_t)(int child_status, struct tevent_signal *sige, void *pvt); +struct sss_child_ctx_old; + /* Set up child termination signal handler */ int child_handler_setup(struct tevent_context *ev, int pid, - sss_child_callback_t cb, void *pvt); + sss_child_callback_t cb, void *pvt, + struct sss_child_ctx_old **_child_ctx); + +/* Destroy child termination signal handler */ +void child_handler_destroy(struct sss_child_ctx_old *ctx); /* Async communication with the child process via a pipe */ struct tevent_req *write_pipe_send(TALLOC_CTX *mem_ctx, |