summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2013-02-01 15:56:34 +0100
committerJeremy Allison <jra@samba.org>2013-02-02 19:53:47 -0800
commitdd9f0c9b6d4141bc3f40cec1567bfb28b572207c (patch)
tree2a402ed20b1d918020758a8ce41bfbd42956e2f5
parent1cfc76f72ae454b13dbaeca22df06cb6f78f078f (diff)
downloadsamba-dd9f0c9b6d4141bc3f40cec1567bfb28b572207c.tar.gz
samba-dd9f0c9b6d4141bc3f40cec1567bfb28b572207c.tar.bz2
samba-dd9f0c9b6d4141bc3f40cec1567bfb28b572207c.zip
tevent_poll: call tevent_common_fd_destructor() from poll_fresh_fde_destructor()
We need to trigger the fde->close_fn(). Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r--lib/tevent/tevent_poll.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/tevent/tevent_poll.c b/lib/tevent/tevent_poll.c
index 7d10665353..b8221a44ce 100644
--- a/lib/tevent/tevent_poll.c
+++ b/lib/tevent/tevent_poll.c
@@ -222,13 +222,14 @@ static int poll_fresh_fde_destructor(struct tevent_fd *fde)
struct poll_event_context *poll_ev;
if (ev == NULL) {
- return 0;
+ goto done;
}
poll_ev = talloc_get_type_abort(
ev->additional_data, struct poll_event_context);
DLIST_REMOVE(poll_ev->fresh, fde);
- return 0;
+done:
+ return tevent_common_fd_destructor(fde);
}
static void poll_event_schedule_immediate(struct tevent_immediate *im,