svn commit: samba r10700 - in branches/SAMBA_4_0/source/winbind: .

tridge at samba.org tridge at samba.org
Tue Oct 4 00:46:32 GMT 2005


Author: tridge
Date: 2005-10-04 00:46:31 +0000 (Tue, 04 Oct 2005)
New Revision: 10700

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10700

Log:

removed volkers temporary timer hack now that freeing the netlogon
pipe is safe while inside a rpc callback

Modified:
   branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c


Changeset:
Modified: branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c	2005-10-04 00:43:16 UTC (rev 10699)
+++ branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c	2005-10-04 00:46:31 UTC (rev 10700)
@@ -256,12 +256,6 @@
 	}
 }
 
-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 @@
 	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;
 	}



More information about the samba-cvs mailing list