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)

8 files changed, 26 insertions, 13 deletions

diff --git a/source4/lib/com/com.h b/source4/lib/com/com.h
index 97841e14c3..0a26a568b0 100644
--- a/source4/lib/com/com.h
+++ b/source4/lib/com/com.h
@@ -26,6 +26,7 @@ struct IUnknown_vtable;
 struct com_context 
 {
 	struct dcom_client_context *dcom;
+	struct event_context *event_ctx;
 };
 
 typedef struct IUnknown *(*get_class_object_function) (const struct GUID *clsid);
diff --git a/source4/lib/com/dcom/main.c b/source4/lib/com/dcom/main.c
index 08a928cda6..bc47cb7c68 100644
--- a/source4/lib/com/dcom/main.c
+++ b/source4/lib/com/dcom/main.c
@@ -84,7 +84,7 @@ static NTSTATUS dcom_connect_host(struct com_context *ctx, struct dcerpc_pipe **
 		return dcerpc_pipe_connect(ctx, p, "ncalrpc", 
 					   DCERPC_IREMOTEACTIVATION_UUID, 
 					   DCERPC_IREMOTEACTIVATION_VERSION,
-					   ctx->dcom->credentials);
+					   ctx->dcom->credentials, ctx->event_ctx);
 	}
 
 	/* Allow server name to contain a binding string */
@@ -92,7 +92,7 @@ static NTSTATUS dcom_connect_host(struct com_context *ctx, struct dcerpc_pipe **
 		status = dcerpc_pipe_connect_b(ctx, p, bd, 
 					       DCERPC_IREMOTEACTIVATION_UUID, 
 					       DCERPC_IREMOTEACTIVATION_VERSION, 
-						   ctx->dcom->credentials);
+					       ctx->dcom->credentials, ctx->event_ctx);
 
 		talloc_free(mem_ctx);
 		return status;
@@ -109,7 +109,7 @@ static NTSTATUS dcom_connect_host(struct com_context *ctx, struct dcerpc_pipe **
 		status = dcerpc_pipe_connect(ctx, p, binding, 
 					     DCERPC_IREMOTEACTIVATION_UUID, 
 					     DCERPC_IREMOTEACTIVATION_VERSION, 
-						 ctx->dcom->credentials);
+					     ctx->dcom->credentials, ctx->event_ctx);
 
 		if (NT_STATUS_IS_OK(status)) {
 			talloc_free(mem_ctx);
@@ -256,7 +256,7 @@ WERROR dcom_get_class_object(struct com_context *ctx, struct GUID *clsid, const
 	return WERR_OK;
 }
 
-NTSTATUS dcom_get_pipe (struct IUnknown *iface, struct dcerpc_pipe **pp)
+NTSTATUS dcom_get_pipe(struct IUnknown *iface, struct dcerpc_pipe **pp)
 {
 	struct dcerpc_binding *binding;
 	struct GUID iid;
@@ -301,9 +301,13 @@ NTSTATUS dcom_get_pipe (struct IUnknown *iface, struct dcerpc_pipe **pp)
 		if (!NT_STATUS_IS_OK(status)) {
 			DEBUG(1, ("Error parsing string binding"));
 		} else {
+			/* TODO: jelmer, please look at this. The
+			   "NULL" here should be a real event
+			   context */
 			status = dcerpc_pipe_connect_b(NULL, &p, binding, 
 						       uuid, 0.0, 
-						       iface->ctx->dcom->credentials);
+						       iface->ctx->dcom->credentials,
+						       NULL);
 		}
 		talloc_free(binding);
 		i++;
diff --git a/source4/lib/com/main.c b/source4/lib/com/main.c
index 378c3738b9..210e8ba79c 100644
--- a/source4/lib/com/main.c
+++ b/source4/lib/com/main.c
@@ -21,11 +21,16 @@
 #include "includes.h"
 #include "dlinklist.h"
 #include "lib/com/com.h"
+#include "lib/events/events.h"
 #include "librpc/gen_ndr/com_dcom.h"
 
-WERROR com_init(struct com_context **ctx)
+WERROR com_init(struct com_context **ctx, struct event_context *event_ctx)
 {
 	*ctx = talloc(NULL, struct com_context);
+	if (event_ctx == NULL) {
+		event_ctx = event_context_init(*ctx);
+	}
+	(*ctx)->event_ctx = event_ctx;
 	return WERR_OK;
 }
 
diff --git a/source4/lib/registry/reg_backend_rpc.c b/source4/lib/registry/reg_backend_rpc.c
index 88cce2584e..3c38b5d312 100644
--- a/source4/lib/registry/reg_backend_rpc.c
+++ b/source4/lib/registry/reg_backend_rpc.c
@@ -362,7 +362,8 @@ static struct hive_operations reg_backend_rpc = {
 	.num_values = rpc_num_values,
 };
 
-WERROR reg_open_remote (struct registry_context **ctx, struct cli_credentials *credentials, const char *location)
+WERROR reg_open_remote(struct registry_context **ctx, struct cli_credentials *credentials, 
+		       const char *location, struct event_context *ev)
 {
 	NTSTATUS status;
 	struct dcerpc_pipe *p;
@@ -378,7 +379,7 @@ WERROR reg_open_remote (struct registry_context **ctx, struct cli_credentials *c
 				     &p, location, 
 				     DCERPC_WINREG_UUID,
 				     DCERPC_WINREG_VERSION,
-				     credentials);
+				     credentials, ev);
 	(*ctx)->backend_data = p;
 
 	if(NT_STATUS_IS_ERR(status)) {
diff --git a/source4/lib/registry/tools/regdiff.c b/source4/lib/registry/tools/regdiff.c
index f86c0ae383..a9d189c033 100644
--- a/source4/lib/registry/tools/regdiff.c
+++ b/source4/lib/registry/tools/regdiff.c
@@ -144,8 +144,10 @@ static void writediff(struct registry_key *oldkey, struct registry_key *newkey,
 			break;
 		case 'R':
 			if (!h1 && !from_null) 
-				error = reg_open_remote(&h1, cmdline_credentials, poptGetOptArg(pc));
-			else if (!h2) error = reg_open_remote(&h2, cmdline_credentials, poptGetOptArg(pc));
+				error = reg_open_remote(&h1, cmdline_credentials, 
+							poptGetOptArg(pc), NULL);
+			else if (!h2) error = reg_open_remote(&h2, cmdline_credentials, 
+							      poptGetOptArg(pc), NULL);
 			break;
 		}
 
diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index 02ef4d4655..3ada9f66e2 100644
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -763,7 +763,7 @@ static int nt_apply_reg_command_file(struct registry_context *r, const char *cmd
 	}
 
 	if (remote) {
-		error = reg_open_remote (&h, cmdline_credentials, remote);
+		error = reg_open_remote (&h, cmdline_credentials, remote, NULL);
 	} else {
 		error = reg_open_local (&h);
 	}
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index 0c53f737b8..108cc17336 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -390,7 +390,7 @@ static char **reg_completion(const char *text, int start, int end)
 	}
 
 	if (remote) {
-		error = reg_open_remote (&h, cmdline_credentials, remote); 
+		error = reg_open_remote (&h, cmdline_credentials, remote, NULL); 
 	} else if (backend) {
 		error = reg_open_hive(NULL, backend, poptGetArg(pc), NULL, &curkey);
 	} else {
diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c
index f18467b523..2385123b7f 100644
--- a/source4/lib/registry/tools/regtree.c
+++ b/source4/lib/registry/tools/regtree.c
@@ -99,7 +99,7 @@ static void print_tree(int l, struct registry_key *p, int fullpath, int novals)
 	}
 
 	if (remote) {
-		error = reg_open_remote(&h, cmdline_credentials, remote);
+		error = reg_open_remote(&h, cmdline_credentials, remote, NULL);
 	} else if (backend) {
 	    error = reg_open_hive(NULL, backend, poptGetArg(pc), NULL, &root);
 	} else {