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)

14 files changed, 21 insertions, 20 deletions

diff --git a/source4/torture/auth/ntlmssp.c b/source4/torture/auth/ntlmssp.c
index 48deb4e73a..578acb4441 100644
--- a/source4/torture/auth/ntlmssp.c
+++ b/source4/torture/auth/ntlmssp.c
@@ -31,7 +31,7 @@ BOOL torture_ntlmssp_self_check(void)
 	DATA_BLOB sig, expected_sig;
 	NTSTATUS status;
 
-	status = gensec_client_start(NULL, &gensec_security);
+	status = gensec_client_start(NULL, &gensec_security, NULL);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
@@ -83,7 +83,7 @@ BOOL torture_ntlmssp_self_check(void)
 
 	talloc_free(gensec_security);
 
-	status = gensec_client_start(NULL, &gensec_security);
+	status = gensec_client_start(NULL, &gensec_security, NULL);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("Failed to start GENSEC for NTLMSSP\n");
diff --git a/source4/torture/com/simple.c b/source4/torture/com/simple.c
index 25800896db..12ff6bee3c 100644
--- a/source4/torture/com/simple.c
+++ b/source4/torture/com/simple.c
@@ -38,7 +38,7 @@ static BOOL test_readwrite(TALLOC_CTX *mem_ctx, const char *host)
 	char test_data[5];
 	int i;
 
-	com_init(&ctx);
+	com_init(&ctx, NULL);
 	dcom_client_init(ctx, cmdline_credentials);
 
 	GUID_from_string(COM_ISTREAM_UUID, &IID[0]);
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index 1baad25290..a9d162b540 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -183,7 +183,7 @@ static BOOL connect_servers(void)
 			status = smbcli_full_connection(NULL, &servers[i].cli[j],
 							servers[i].server_name, 
 							servers[i].share_name, NULL, 
-							servers[i].credentials);
+							servers[i].credentials, NULL);
 			if (!NT_STATUS_IS_OK(status)) {
 				printf("Failed to connect to \\\\%s\\%s - %s\n",
 				       servers[i].server_name, servers[i].share_name,
diff --git a/source4/torture/libnet/libnet_user.c b/source4/torture/libnet/libnet_user.c
index 93cd540097..2e5dc96448 100644
--- a/source4/torture/libnet/libnet_user.c
+++ b/source4/torture/libnet/libnet_user.c
@@ -106,7 +106,7 @@ BOOL torture_createuser(void)
 	mem_ctx = talloc_init("test_createuser");
 	binding = lp_parm_string(-1, "torture", "binding");
 
-	ctx = libnet_context_init();
+	ctx = libnet_context_init(NULL);
 	ctx->cred = cmdline_credentials;
 
 	req.in.user_name = TEST_USERNAME;
diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c
index 583ce87624..4b4e9d3bd3 100644
--- a/source4/torture/locktest.c
+++ b/source4/torture/locktest.c
@@ -122,7 +122,7 @@ static struct smbcli_state *connect_one(char *share, int snum)
 		status = smbcli_full_connection(NULL, &c, 
 						server, 
 						share, NULL,
-						servers[snum]);
+						servers[snum], NULL);
 		if (!NT_STATUS_IS_OK(status)) {
 			sleep(2);
 		}
diff --git a/source4/torture/locktest2.c b/source4/torture/locktest2.c
index aef45396eb..4bd99cd5d0 100644
--- a/source4/torture/locktest2.c
+++ b/source4/torture/locktest2.c
@@ -165,7 +165,7 @@ static struct smbcli_state *connect_one(char *share)
 
 	nt_status = smbcli_full_connection(NULL, 
 					   &c, myname, server_n, 0, share, NULL,
-					   username, lp_workgroup(), password);
+					   username, lp_workgroup(), password, NULL);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		DEBUG(0, ("smbcli_full_connection failed with error %s\n", nt_errstr(nt_status)));
 		return NULL;
diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index 1536ddafd8..4ad280eac7 100644
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -82,7 +82,7 @@ static struct smbcli_state *connect_one(char *share)
 	status = smbcli_full_connection(NULL, &c,
 					server, 
 					share, NULL,
-					credentials);
+					credentials, NULL);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return NULL;
diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c
index be9cf649d3..7dfa67ce95 100644
--- a/source4/torture/rpc/mgmt.c
+++ b/source4/torture/rpc/mgmt.c
@@ -212,7 +212,7 @@ BOOL torture_rpc_mgmt(void)
 		if (b->transport == NCACN_IP_TCP) {
 			status = dcerpc_epm_map_binding(loop_ctx, b, 
 							l->table->uuid,
-							l->table->if_version);
+							l->table->if_version, NULL);
 			if (!NT_STATUS_IS_OK(status)) {
 				talloc_free(loop_ctx);
 				printf("Failed to map port for uuid %s\n", l->table->uuid);
diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index 12b7ea92b1..37b9025194 100644
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -1363,7 +1363,7 @@ BOOL torture_rpc_samlogon(void)
 	status = dcerpc_pipe_connect_b(mem_ctx, &p, b, 
 				       DCERPC_NETLOGON_UUID,
 				       DCERPC_NETLOGON_VERSION,
-				       credentials);
+				       credentials, NULL);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("RPC pipe connect as domain member failed: %s\n", nt_errstr(status));
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 4690b18ead..652fef15c3 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -1505,7 +1505,7 @@ BOOL torture_rpc_samsync(void)
 				       &samsync_state->p, b, 
 				       DCERPC_NETLOGON_UUID,
 				       DCERPC_NETLOGON_VERSION,
-				       credentials);
+				       credentials, NULL);
 	
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("Failed to connect to server as a BDC: %s\n", nt_errstr(status));
@@ -1545,7 +1545,7 @@ BOOL torture_rpc_samsync(void)
 				       b_netlogon_wksta, 
 				       DCERPC_NETLOGON_UUID,
 				       DCERPC_NETLOGON_VERSION,
-				       credentials_wksta);
+				       credentials_wksta, NULL);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("Failed to connect to server as a Workstation: %s\n", nt_errstr(status));
diff --git a/source4/torture/rpc/scanner.c b/source4/torture/rpc/scanner.c
index d7a5d03271..9741273c64 100644
--- a/source4/torture/rpc/scanner.c
+++ b/source4/torture/rpc/scanner.c
@@ -168,7 +168,7 @@ BOOL torture_rpc_scanner(void)
 		if (b->transport == NCACN_IP_TCP) {
 			status = dcerpc_epm_map_binding(mem_ctx, b, 
 							 l->table->uuid,
-							 l->table->if_version);
+							 l->table->if_version, NULL);
 			if (!NT_STATUS_IS_OK(status)) {
 				talloc_free(loop_ctx);
 				printf("Failed to map port for uuid %s\n", l->table->uuid);
diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index 75f9198106..e87f950b62 100644
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -171,7 +171,7 @@ static BOOL test_schannel(TALLOC_CTX *mem_ctx,
 				       &p, b, 
 				       DCERPC_SAMR_UUID,
 				       DCERPC_SAMR_VERSION,
-				       credentials);
+				       credentials, NULL);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("Failed to connect with schannel: %s\n", nt_errstr(status));
 		goto failed;
@@ -193,7 +193,7 @@ static BOOL test_schannel(TALLOC_CTX *mem_ctx,
 
 	/* Swap the binding details from SAMR to NETLOGON */
 	status = dcerpc_epm_map_binding(test_ctx, b, DCERPC_NETLOGON_UUID,
-					DCERPC_NETLOGON_VERSION);
+					DCERPC_NETLOGON_VERSION, NULL);
 	if (!NT_STATUS_IS_OK(status)) {
 		goto failed;
 	}
diff --git a/source4/torture/rpc/xplogin.c b/source4/torture/rpc/xplogin.c
index 3a5a2f5844..c841267d97 100644
--- a/source4/torture/rpc/xplogin.c
+++ b/source4/torture/rpc/xplogin.c
@@ -208,7 +208,8 @@ static NTSTATUS connect_to_pipe(struct dcerpc_pipe **pp,
 
 	/* Look up identifier using the epmapper */
 	if (!b->endpoint) {
-		status = dcerpc_epm_map_binding(tmp_ctx, b, pipe_uuid, pipe_version);
+		status = dcerpc_epm_map_binding(tmp_ctx, b, pipe_uuid, pipe_version,
+						NULL);
 		if (!NT_STATUS_IS_OK(status)) {
 			DEBUG(0,("Failed to map DCERPC/TCP NCACN_NP pipe for '%s' - %s\n", 
 				 pipe_uuid, nt_errstr(status)));
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index a2ca9fc72f..c96f862142 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -82,7 +82,7 @@ BOOL torture_open_connection_share(struct smbcli_state **c,
 	status = smbcli_full_connection(NULL,
 					c, hostname, 
 					sharename, NULL,
-					cmdline_credentials);
+					cmdline_credentials, NULL);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("Failed to open connection - %s\n", nt_errstr(status));
 		return False;
@@ -133,7 +133,7 @@ NTSTATUS torture_rpc_connection(TALLOC_CTX *parent_ctx,
 
 	status = dcerpc_pipe_connect(parent_ctx, 
 				     p, binding, pipe_uuid, pipe_version,
-				     cmdline_credentials);
+				     cmdline_credentials, NULL);
  
         return status;
 }
@@ -167,7 +167,7 @@ NTSTATUS torture_rpc_connection_transport(TALLOC_CTX *parent_ctx,
 	b->transport = transport;
 
 	status = dcerpc_pipe_connect_b(mem_ctx, p, b, pipe_uuid, pipe_version,
-								   cmdline_credentials);
+				       cmdline_credentials, NULL);
 					   
 	if (NT_STATUS_IS_OK(status)) {
 		*p = talloc_reference(parent_ctx, *p);
@@ -612,7 +612,7 @@ static BOOL run_tcon_devtype_test(void)
 	status = smbcli_full_connection(NULL,
 					&cli1, host, 
 					share, NULL,
-					cmdline_credentials);
+					cmdline_credentials, NULL);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("could not open connection\n");