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)

6 files changed, 12 insertions, 9 deletions

diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index a866e26970..0009151429 100644
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -134,7 +134,8 @@ NTSTATUS smbcli_full_connection(TALLOC_CTX *parent_ctx,
 				const char *host,
 				const char *sharename,
 				const char *devtype,
-				struct cli_credentials *credentials)
+				struct cli_credentials *credentials,
+				struct event_context *ev)
 {
 	struct smbcli_tree *tree;
 	NTSTATUS status;
@@ -143,7 +144,7 @@ NTSTATUS smbcli_full_connection(TALLOC_CTX *parent_ctx,
 
 	status = smbcli_tree_full_connection(parent_ctx,
 					     &tree, host, 0, sharename, devtype,
-					     credentials);
+					     credentials, ev);
 	if (!NT_STATUS_IS_OK(status)) {
 		goto done;
 	}
diff --git a/source4/libcli/composite/connect.c b/source4/libcli/composite/connect.c
index 9e33a2f7db..fb439172d0 100644
--- a/source4/libcli/composite/connect.c
+++ b/source4/libcli/composite/connect.c
@@ -382,8 +382,9 @@ NTSTATUS smb_composite_connect_recv(struct composite_context *c, TALLOC_CTX *mem
 /*
   sync version of smb_composite_connect 
 */
-NTSTATUS smb_composite_connect(struct smb_composite_connect *io, TALLOC_CTX *mem_ctx)
+NTSTATUS smb_composite_connect(struct smb_composite_connect *io, TALLOC_CTX *mem_ctx,
+			       struct event_context *ev)
 {
-	struct composite_context *c = smb_composite_connect_send(io, NULL);
+	struct composite_context *c = smb_composite_connect_send(io, ev);
 	return smb_composite_connect_recv(c, mem_ctx);
 }
diff --git a/source4/libcli/composite/sesssetup.c b/source4/libcli/composite/sesssetup.c
index ab46c198ef..2736d91262 100644
--- a/source4/libcli/composite/sesssetup.c
+++ b/source4/libcli/composite/sesssetup.c
@@ -263,7 +263,7 @@ static struct smbcli_request *session_setup_spnego(struct composite_context *c,
 
 	smbcli_temp_set_signing(session->transport);
 
-	status = gensec_client_start(session, &session->gensec);
+	status = gensec_client_start(session, &session->gensec, c->event_ctx);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(1, ("Failed to start GENSEC client mode: %s\n", nt_errstr(status)));
 		return NULL;
diff --git a/source4/libcli/ldap/ldap_bind.c b/source4/libcli/ldap/ldap_bind.c
index 11a6997fb2..ea97798261 100644
--- a/source4/libcli/ldap/ldap_bind.c
+++ b/source4/libcli/ldap/ldap_bind.c
@@ -144,7 +144,7 @@ NTSTATUS ldap_bind_sasl(struct ldap_connection *conn, struct cli_credentials *cr
 	DATA_BLOB input = data_blob(NULL, 0);
 	DATA_BLOB output = data_blob(NULL, 0);
 
-	status = gensec_client_start(conn, &conn->gensec);
+	status = gensec_client_start(conn, &conn->gensec, NULL);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0, ("Failed to start GENSEC engine (%s)\n", nt_errstr(status)));
 		goto failed;
diff --git a/source4/libcli/raw/clitree.c b/source4/libcli/raw/clitree.c
index 87c2dbba7c..76cb1a43fe 100644
--- a/source4/libcli/raw/clitree.c
+++ b/source4/libcli/raw/clitree.c
@@ -166,7 +166,8 @@ NTSTATUS smbcli_tree_full_connection(TALLOC_CTX *parent_ctx,
 				     struct smbcli_tree **ret_tree, 
 				     const char *dest_host, int port,
 				     const char *service, const char *service_type,
-				     struct cli_credentials *credentials)
+				     struct cli_credentials *credentials,
+				     struct event_context *ev)
 {
 	struct smb_composite_connect io;
 	NTSTATUS status;
@@ -179,7 +180,7 @@ NTSTATUS smbcli_tree_full_connection(TALLOC_CTX *parent_ctx,
 	io.in.credentials = credentials;
 	io.in.workgroup = lp_workgroup();
 	
-	status = smb_composite_connect(&io, parent_ctx);
+	status = smb_composite_connect(&io, parent_ctx, ev);
 	if (NT_STATUS_IS_OK(status)) {
 		*ret_tree = io.out.tree;
 	}
diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c
index 0c0c64c0b4..ad2006756b 100644
--- a/source4/libcli/util/clilsa.c
+++ b/source4/libcli/util/clilsa.c
@@ -76,7 +76,7 @@ static NTSTATUS smblsa_connect(struct smbcli_state *cli)
 	}
 	lsa->ipc_tree->tid = tcon.tconx.out.tid;
 
-	lsa->pipe = dcerpc_pipe_init(lsa);
+	lsa->pipe = dcerpc_pipe_init(lsa, cli->transport->socket->event.ctx);
 	if (lsa->pipe == NULL) {
 		talloc_free(lsa);
 		return NT_STATUS_NO_MEMORY;