r10684: Add a nasty hack for the failure case of wbinfo -t. Tridge has a proper fix

for it pending.

Also fix a bug with timed events: Don't call the same event recursively in the
handler's inner semi-async event loop.

Volker
(This used to be commit e38e50127a3414461578421e676a9c58c106c272)

1 files changed, 9 insertions, 1 deletions

diff --git a/source4/lib/events/events_standard.c b/source4/lib/events/events_standard.c
index 8fe8d009bf..146dbc6b22 100644
--- a/source4/lib/events/events_standard.c
+++ b/source4/lib/events/events_standard.c
@@ -347,9 +347,17 @@ static void std_event_loop_timer(struct event_context *ev)
 
 	/* deny the handler to free the event */
 	talloc_set_destructor(te, std_event_timed_deny_destructor);
+
+	/* We need to remove the timer from the list before calling the
+	 * handler because in a semi-async inner event loop called from the
+	 * handler we don't want to come across this event again -- vl */
+	DLIST_REMOVE(std_ev->timed_events, te);
+
 	te->handler(ev, te, t, te->private_data);
 
-	talloc_set_destructor(te, std_event_timed_destructor);
+	/* The destructor isn't necessary anymore, we've already removed the
+	 * event from the list. */
+
 	talloc_free(te);
 }