summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarolin Seeger <kseeger@samba.org>2008-11-17 14:02:50 +0100
committerKarolin Seeger <kseeger@samba.org>2008-11-17 14:02:50 +0100
commit007bdd95e1a410979cf7975cd0aa3df46843cc82 (patch)
tree63af6aab417f70b665ce4b1eee94ce3a1f7e1a53
parente7fa97b6aa202b57c479555d0af1884a5fce781e (diff)
downloadsamba-007bdd95e1a410979cf7975cd0aa3df46843cc82.tar.gz
samba-007bdd95e1a410979cf7975cd0aa3df46843cc82.tar.xz
samba-007bdd95e1a410979cf7975cd0aa3df46843cc82.zip
Revert "Fix bug #5814 - Winbindd dumping core in a strange manner while doing "rescan_trusted_domain"."
This reverts commit 15b2f1d8744d157b131a0441e8738d8519de37c7.
-rw-r--r--source/winbindd/winbindd_dual.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/source/winbindd/winbindd_dual.c b/source/winbindd/winbindd_dual.c
index acf0908657d..de6ad61a112 100644
--- a/source/winbindd/winbindd_dual.c
+++ b/source/winbindd/winbindd_dual.c
@@ -300,18 +300,6 @@ static void schedule_async_request(struct winbindd_child *child)
return; /* Busy */
}
- /*
- * This may be a reschedule, so we might
- * have an existing timeout event pending on
- * the first entry in the child->requests list
- * (we only send one request at a time).
- * Ensure we free it before we reschedule.
- * Bug #5814, from hargagan <shargagan@novell.com>.
- * JRA.
- */
-
- TALLOC_FREE(request->reply_timeout_event);
-
if ((child->pid == 0) && (!fork_domain_child(child))) {
/* fork_domain_child failed.
Cancel all outstanding requests */
@@ -507,17 +495,6 @@ void winbind_child_died(pid_t pid)
child->event.flags = 0;
child->pid = 0;
- if (child->requests) {
- /*
- * schedule_async_request() will also
- * clear this event but the call is
- * idempotent so it doesn't hurt to
- * cover all possible future code
- * paths. JRA.
- */
- TALLOC_FREE(child->requests->reply_timeout_event);
- }
-
schedule_async_request(child);
}