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)

2 files changed, 3 insertions, 3 deletions

diff --git a/source4/client/client.c b/source4/client/client.c
index afdab5928c..a24fd7bfd3 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -2730,7 +2730,7 @@ static BOOL browse_host(const char *query_host)
 	status = dcerpc_pipe_connect(mem_ctx, &p, binding, 
 				     DCERPC_SRVSVC_UUID, 
 				     DCERPC_SRVSVC_VERSION,
-				     cmdline_credentials);
+				     cmdline_credentials, NULL);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_printf("Failed to connect to %s - %s\n", 
 			 binding, nt_errstr(status));
@@ -3220,7 +3220,7 @@ static struct smbcli_state *do_connect(const char *server, const char *share, st
 	}
 	
 	status = smbcli_full_connection(NULL, &c, server,
-					share, NULL, cred);
+					share, NULL, cred, NULL);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_printf("Connection to \\\\%s\\%s failed - %s\n", 
 			 server, share, nt_errstr(status));
diff --git a/source4/client/smbspool.c b/source4/client/smbspool.c
index 41cb4c9bf3..2e7afc5ec4 100644
--- a/source4/client/smbspool.c
+++ b/source4/client/smbspool.c
@@ -280,7 +280,7 @@ smb_connect(const char *workgroup,		/* I - Workgroup */
   myname = get_myname();  
   	
   nt_status = smbcli_full_connection(NULL, &c, myname, server, 0, share, NULL,
-				     username, workgroup, password);
+				     username, workgroup, password, NULL);
   
   free(myname);
   if (!NT_STATUS_IS_OK(nt_status)) {