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/ldap_server | |
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/ldap_server')
-rw-r--r-- | source4/ldap_server/ldap_bind.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/ldap_server/ldap_bind.c b/source4/ldap_server/ldap_bind.c index 3c51dc2ba5..7b416c9726 100644 --- a/source4/ldap_server/ldap_bind.c +++ b/source4/ldap_server/ldap_bind.c @@ -22,6 +22,7 @@ #include "ldap_server/ldap_server.h" #include "auth/auth.h" #include "libcli/ldap/ldap.h" +#include "smbd/service_stream.h" static NTSTATUS ldapsrv_BindSimple(struct ldapsrv_call *call) { @@ -63,7 +64,8 @@ static NTSTATUS ldapsrv_BindSASL(struct ldapsrv_call *call) if (!call->conn->gensec) { call->conn->session_info = NULL; - status = gensec_server_start(call->conn, &call->conn->gensec); + status = gensec_server_start(call->conn, &call->conn->gensec, + call->conn->connection->event.ctx); if (!NT_STATUS_IS_OK(status)) { DEBUG(1, ("Failed to start GENSEC server code: %s\n", nt_errstr(status))); return status; |