summaryrefslogtreecommitdiff
path: root/source4/libnet/libnet.h
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-06-16 11:36:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:18:15 -0500
commitaf237084ecd4f9928c6c282b9c5c73598d5c73d6 (patch)
treea11f156dd4a4d20deaf74c16d90ae20d0f59f365 /source4/libnet/libnet.h
parent3b9dfb0da3e6e7afff7be60b571493bb288d385f (diff)
downloadsamba-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/libnet/libnet.h')
-rw-r--r--source4/libnet/libnet.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/libnet/libnet.h b/source4/libnet/libnet.h
index b26ce72ba6..092d09599f 100644
--- a/source4/libnet/libnet.h
+++ b/source4/libnet/libnet.h
@@ -19,8 +19,6 @@
*/
struct libnet_context {
- TALLOC_CTX *mem_ctx;
-
/* here we need:
* a client env context
* a user env context
@@ -33,6 +31,8 @@ struct libnet_context {
/* opened handles */
struct policy_handle domain_handle;
struct policy_handle user_handle;
+
+ struct event_context *event_ctx;
};