From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 4 Mar 2010 23:43:34 +0000 (+1100)
Subject: s4-dns-ex: use autoclose on the dns child pipe
X-Git-Tag: samba-3.6.0pre1~4785
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d30f4fb4fd39fb0949cd948559725917f95742f;p=thirdparty%2Fsamba.git

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 <abartlet@samba.org>
---

diff --git a/source4/libcli/resolve/dns_ex.c b/source4/libcli/resolve/dns_ex.c
index 79ed78340c4..423668d4b6c 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) {