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/libcli/composite | |
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/libcli/composite')
-rw-r--r-- | source4/libcli/composite/connect.c | 5 | ||||
-rw-r--r-- | source4/libcli/composite/sesssetup.c | 2 |
2 files changed, 4 insertions, 3 deletions
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; |