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
(This used to be commit 3a3025485bdb8f600ab528c0b4b4eef0c65e3fc9)

1 files changed, 1 insertions, 14 deletions

diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c
index 90013e9778..8bfba008a2 100644
--- a/source4/librpc/rpc/dcerpc_sock.c
+++ b/source4/librpc/rpc/dcerpc_sock.c
@@ -36,7 +36,6 @@ struct sock_blob {
 
 /* transport private information used by general socket pipe transports */
 struct sock_private {
-	struct event_context *event_ctx;
 	struct fd_event *fde;
 	struct socket_context *sock;
 	char *server_name;
@@ -260,16 +259,6 @@ static NTSTATUS sock_send_request(struct dcerpc_connection *p, DATA_BLOB *data,
 }
 
 /* 
-   return the event context so the caller can process asynchronously
-*/
-static struct event_context *sock_event_context(struct dcerpc_connection *p)
-{
-	struct sock_private *sock = p->transport.private;
-
-	return sock->event_ctx;
-}
-
-/* 
    shutdown sock pipe connection
 */
 static NTSTATUS sock_shutdown_pipe(struct dcerpc_connection *p)
@@ -331,7 +320,6 @@ static NTSTATUS dcerpc_pipe_open_socket(struct dcerpc_connection *c,
 
 	c->transport.send_request = sock_send_request;
 	c->transport.send_read = sock_send_read;
-	c->transport.event_context = sock_event_context;
 	c->transport.recv_data = NULL;
 
 	c->transport.shutdown_pipe = sock_shutdown_pipe;
@@ -339,13 +327,12 @@ static NTSTATUS dcerpc_pipe_open_socket(struct dcerpc_connection *c,
 	
 	sock->sock = socket_ctx;
 	sock->server_name = strupper_talloc(sock, server);
-	sock->event_ctx = event_context_init(sock);
 	sock->pending_send = NULL;
 	sock->recv.received = 0;
 	sock->recv.data = data_blob(NULL, 0);
 	sock->recv.pending_count = 0;
 
-	sock->fde = event_add_fd(sock->event_ctx, sock, socket_get_fd(sock->sock), 
+	sock->fde = event_add_fd(c->event_ctx, sock, socket_get_fd(sock->sock), 
 				 0, sock_io_handler, c);
 
 	c->transport.private = sock;