summaryrefslogtreecommitdiff
path: root/source4/libcli/composite/composite.c
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-09-27 12:54:08 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:39:03 -0500
commit38e43be7b89673282f8853ffedf726d84ef5ce30 (patch)
tree033693360c0792b05791d418d505f7a367b2b16d /source4/libcli/composite/composite.c
parent82ae72a0cf0ee3aee89573d79f1baffda3612593 (diff)
downloadsamba-38e43be7b89673282f8853ffedf726d84ef5ce30.tar.gz
samba-38e43be7b89673282f8853ffedf726d84ef5ce30.tar.bz2
samba-38e43be7b89673282f8853ffedf726d84ef5ce30.zip
r10537: - we now use a much nicer way to handle talloc_free(timed_event)
the events code replaces a destructor to one that returns allways -1 while it's calling the event handler - we don't need the composite and winsrepl specific fixes any more - this also fixes the problem with smbcli, dcerpc, cldap, ldap and nbt request timeouts metze (This used to be commit 495996cfc49a1c6eefde6ff04fc75e0739be3aab)
Diffstat (limited to 'source4/libcli/composite/composite.c')
-rw-r--r--source4/libcli/composite/composite.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/source4/libcli/composite/composite.c b/source4/libcli/composite/composite.c
index f6fc61d764..4a5247c9ea 100644
--- a/source4/libcli/composite/composite.c
+++ b/source4/libcli/composite/composite.c
@@ -52,12 +52,6 @@ static void composite_trigger(struct event_context *ev, struct timed_event *te,
{
struct composite_context *c = talloc_get_type(ptr, struct composite_context);
if (c->async.fn) {
- /*
- * the event is a child of req,
- * and req will be free'ed by the callback fn
- * but the events code wants to free the event itself
- */
- talloc_steal(ev, te);
c->async.fn(c);
}
}