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)

2 files changed, 0 insertions, 12 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);
 	}
 }
diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c
index 945f4a4b4c..853ee01d38 100644
--- a/source4/libcli/wrepl/winsrepl.c
+++ b/source4/libcli/wrepl/winsrepl.c
@@ -385,12 +385,6 @@ static void wrepl_request_trigger_handler(struct event_context *ev, struct timed
 {
 	struct wrepl_request *req = talloc_get_type(ptr, struct wrepl_request);
 	if (req->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);
 		req->async.fn(req);
 	}
 }