r7633: this patch started as an attempt to make the dcerpc code use a given

event_context for the socket_connect() call, so that when things that
use dcerpc are running alongside anything else it doesn't block the
whole process during a connect.

Then of course I needed to change any code that created a dcerpc
connection (such as the auth code) to also take an event context, and
anything that called that and so on .... thus the size of the patch.

There were 3 places where I punted:

  - abartlet wanted me to add a gensec_set_event_context() call
    instead of adding it to the gensec init calls. Andrew, my
    apologies for not doing this. I didn't do it as adding a new
    parameter allowed me to catch all the callers with the
    compiler. Now that its done, we could go back and use
    gensec_set_event_context()

  - the ejs code calls auth initialisation, which means it should pass
    in the event context from the web server. I punted on that. Needs fixing.

  - I used a NULL event context in dcom_get_pipe(). This is equivalent
    to what we did already, but should be fixed to use a callers event
    context. Jelmer, can you think of a clean way to do that?

I also cleaned up a couple of things:

 - libnet_context_destroy() makes no sense. I removed it.

 - removed some unused vars in various places

1 files changed, 0 insertions, 13 deletions

diff --git a/source/librpc/rpc/dcerpc_smb.c b/source/librpc/rpc/dcerpc_smb.c
index 1a5a31c330f..9096168b644 100644
--- a/source/librpc/rpc/dcerpc_smb.c
+++ b/source/librpc/rpc/dcerpc_smb.c
@@ -310,18 +310,6 @@ static NTSTATUS smb_send_request(struct dcerpc_connection *c, DATA_BLOB *blob, B
 }
 
 /* 
-   return the event context for the pipe, so the caller can wait
-   for events asynchronously
-*/
-static struct event_context *smb_event_context(struct dcerpc_connection *c)
-{
-	struct smb_private *smb = c->transport.private;
-
-	return smb->tree->session->transport->socket->event.ctx;
-}
-
-
-/* 
    shutdown SMB pipe connection
 */
 static NTSTATUS smb_shutdown_pipe(struct dcerpc_connection *c)
@@ -426,7 +414,6 @@ NTSTATUS dcerpc_pipe_open_smb(struct dcerpc_connection *c,
 
 	c->transport.send_request = smb_send_request;
 	c->transport.send_read = send_read_request;
-	c->transport.event_context = smb_event_context;
 	c->transport.recv_data = NULL;
 	
 	/* Over-ride the default session key with the SMB session key */