r20087: Ensure we clean up any random pending events we

may have inherited from our parent in the winbindd
forked child.
Jeremy.
(This used to be commit 0a1352f440a9d9b974ad8d571b2e48a43a15b6cc)

1 files changed, 8 insertions, 2 deletions

diff --git a/source3/nsswitch/winbindd_dual.c b/source3/nsswitch/winbindd_dual.c
index 7a699edb25..1a1afcb404 100644
--- a/source3/nsswitch/winbindd_dual.c
+++ b/source3/nsswitch/winbindd_dual.c
@@ -845,16 +845,22 @@ static BOOL fork_domain_child(struct winbindd_child *child)
 		child->domain->startup_time = time(NULL);
 	}
 
+	/* Ensure we have no pending check_online events other
+	   than one for this domain. */
+
 	for (domain = domain_list(); domain; domain = domain->next) {
 		if (domain != child->domain) {
-			/* Ensure we have no "check_online" events pending
-			   that are not on this domain. */
 			if (domain->check_online_event) {
 				TALLOC_FREE(domain->check_online_event);
 			}
 		}
 	}
 
+	/* Ensure we're not handling an event inherited from
+	   our parent. */
+
+	cancel_named_event("krb5_ticket_refresh_handler");
+
 	while (1) {
 
 		int ret;