From 2d30f4fb4fd39fb0949cd948559725917f95742f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 5 Mar 2010 10:43:34 +1100 Subject: s4-dns-ex: use autoclose on the dns child pipe I'm hoping this will fix an occasional segfault I've noticed where epoll still calls events on a closed fde Pair-Programmed-With: Andrew Bartlett --- source4/libcli/resolve/dns_ex.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source4/libcli/resolve/dns_ex.c') diff --git a/source4/libcli/resolve/dns_ex.c b/source4/libcli/resolve/dns_ex.c index 79ed78340c..423668d4b6 100644 --- a/source4/libcli/resolve/dns_ex.c +++ b/source4/libcli/resolve/dns_ex.c @@ -67,7 +67,6 @@ static int dns_ex_destructor(struct dns_ex_state *state) int status; kill(state->child, SIGTERM); - close(state->child_fd); if (waitpid(state->child, &status, WNOHANG) == 0) { kill(state->child, SIGKILL); waitpid(state->child, &status, 0); @@ -369,7 +368,6 @@ static void pipe_handler(struct tevent_context *ev, struct tevent_fd *fde, } else { ret = -1; } - close(state->child_fd); if (waitpid(state->child, &status, WNOHANG) == 0) { kill(state->child, SIGKILL); waitpid(state->child, &status, 0); @@ -498,6 +496,7 @@ struct composite_context *resolve_name_dns_ex_send(TALLOC_CTX *mem_ctx, close(fd[1]); return c; } + tevent_fd_set_auto_close(state->fde); state->child = fork(); if (state->child == (pid_t)-1) { -- cgit