diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-06-16 11:36:09 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:15 -0500 |
commit | af237084ecd4f9928c6c282b9c5c73598d5c73d6 (patch) | |
tree | a11f156dd4a4d20deaf74c16d90ae20d0f59f365 /source4/gtk | |
parent | 3b9dfb0da3e6e7afff7be60b571493bb288d385f (diff) | |
download | samba-af237084ecd4f9928c6c282b9c5c73598d5c73d6.tar.gz samba-af237084ecd4f9928c6c282b9c5c73598d5c73d6.tar.bz2 samba-af237084ecd4f9928c6c282b9c5c73598d5c73d6.zip |
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)
Diffstat (limited to 'source4/gtk')
-rw-r--r-- | source4/gtk/tools/gepdump.c | 2 | ||||
-rw-r--r-- | source4/gtk/tools/gregedit.c | 5 | ||||
-rw-r--r-- | source4/gtk/tools/gwcrontab.c | 2 | ||||
-rw-r--r-- | source4/gtk/tools/gwsam.c | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/source4/gtk/tools/gepdump.c b/source4/gtk/tools/gepdump.c index 4dacd2937c..23d95152f4 100644 --- a/source4/gtk/tools/gepdump.c +++ b/source4/gtk/tools/gepdump.c @@ -197,7 +197,7 @@ static void on_connect_clicked(GtkButton *btn, gpointer user_data) status = dcerpc_pipe_connect(talloc_autofree_context(), &epmapper_pipe, bs, DCERPC_EPMAPPER_UUID, DCERPC_EPMAPPER_VERSION, - credentials); + credentials, NULL); if (NT_STATUS_IS_ERR(status)) { gtk_show_ntstatus(mainwin, "Error connecting to endpoint mapper", status); diff --git a/source4/gtk/tools/gregedit.c b/source4/gtk/tools/gregedit.c index 72dd9ae929..27ae925746 100644 --- a/source4/gtk/tools/gregedit.c +++ b/source4/gtk/tools/gregedit.c @@ -412,8 +412,9 @@ static void on_open_remote_activate(GtkMenuItem *menuitem, gpointer user_data) cli_credentials_set_gtk_callbacks(creds); error = reg_open_remote(®istry, - creds, - gtk_rpc_binding_dialog_get_binding_string(GTK_RPC_BINDING_DIALOG(rpcwin), mem_ctx)); + creds, + gtk_rpc_binding_dialog_get_binding_string(GTK_RPC_BINDING_DIALOG(rpcwin), mem_ctx), + NULL); if(!W_ERROR_IS_OK(error)) { gtk_show_werror(mainwin, "Error while opening remote registry", error); diff --git a/source4/gtk/tools/gwcrontab.c b/source4/gtk/tools/gwcrontab.c index eba8b54ac0..5b79eafa0a 100644 --- a/source4/gtk/tools/gwcrontab.c +++ b/source4/gtk/tools/gwcrontab.c @@ -109,7 +109,7 @@ static void on_connect_activate(GtkMenuItem *menuitem, gpointer user_data) gtk_rpc_binding_dialog_get_binding(d, mem_ctx), DCERPC_ATSVC_UUID, DCERPC_ATSVC_VERSION, - credentials); + credentials, NULL); if(!NT_STATUS_IS_OK(status)) { gtk_show_ntstatus(mainwin, "Error while connecting to at service", status); diff --git a/source4/gtk/tools/gwsam.c b/source4/gtk/tools/gwsam.c index cf82ddb767..8606cc398f 100644 --- a/source4/gtk/tools/gwsam.c +++ b/source4/gtk/tools/gwsam.c @@ -131,7 +131,7 @@ static void connect_sam(void) /* If connected, get list of jobs */ status = dcerpc_pipe_connect_b(mem_ctx, &sam_pipe, gtk_rpc_binding_dialog_get_binding(d, mem_ctx), - DCERPC_SAMR_UUID, DCERPC_SAMR_VERSION, cred ); + DCERPC_SAMR_UUID, DCERPC_SAMR_VERSION, cred, NULL); if(!NT_STATUS_IS_OK(status)) { gtk_show_ntstatus(mainwin, "While connecting to SAMR interface", status); |