summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-10-04 00:46:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:39:21 -0500
commit6bc8d37c20bf372a74d18621043588aee929008f (patch)
tree6c89b085782711046d81ddec58001ae65001ed35
parenta872005c1c725e571e7da263d75e634affd1f87d (diff)
downloadsamba-6bc8d37c20bf372a74d18621043588aee929008f.tar.gz
samba-6bc8d37c20bf372a74d18621043588aee929008f.tar.bz2
samba-6bc8d37c20bf372a74d18621043588aee929008f.zip
r10700: removed volkers temporary timer hack now that freeing the netlogon
pipe is safe while inside a rpc callback (This used to be commit 5d752a519416c7a0c8c7d166f43eadc75cb5c37f)
-rw-r--r--source4/winbind/wb_samba3_cmd.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c
index 751c48f8fd..d0c38d607e 100644
--- a/source4/winbind/wb_samba3_cmd.c
+++ b/source4/winbind/wb_samba3_cmd.c
@@ -256,12 +256,6 @@ static void wbsrv_samba3_check_machacc_receive_tree(struct composite_context *ac
}
}
-static void delete_pipe(struct event_context *ctx, struct timed_event *te,
- struct timeval tv, void *p)
-{
- talloc_free(p);
-}
-
static void wbsrv_samba3_check_machacc_receive_creds(struct composite_context *action)
{
struct wbsrv_samba3_call *s3call =
@@ -281,12 +275,7 @@ static void wbsrv_samba3_check_machacc_receive_creds(struct composite_context *a
state->conn->out.tree = NULL;
if (!NT_STATUS_IS_OK(status)) {
- /* Nasty hack awaiting a proper fix. So far we can not
- * delete a pipe from an async rpc callback which where we are
- * in right now, so delete the pipe from an event handler.. */
- event_add_timed(s3call->call->event_ctx, service,
- timeval_zero(),
- delete_pipe, state->getcreds->out.netlogon);
+ talloc_free(service->netlogon);
service->netlogon = NULL;
goto done;
}