summaryrefslogtreecommitdiff
path: root/source4/smb_server/negprot.c
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/smb_server/negprot.c
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/smb_server/negprot.c')
-rw-r--r--source4/smb_server/negprot.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source4/smb_server/negprot.c b/source4/smb_server/negprot.c
index 0a33b105cd..31f31272e0 100644
--- a/source4/smb_server/negprot.c
+++ b/source4/smb_server/negprot.c
@@ -38,7 +38,9 @@ static NTSTATUS get_challenge(struct smbsrv_connection *smb_conn, uint8_t buff[8
DEBUG(10, ("get challenge: creating negprot_global_auth_context\n"));
- nt_status = auth_context_create(smb_conn, lp_auth_methods(), &smb_conn->negotiate.auth_context);
+ nt_status = auth_context_create(smb_conn, lp_auth_methods(),
+ &smb_conn->negotiate.auth_context,
+ smb_conn->connection->event.ctx);
if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(0, ("auth_context_create() returned %s", nt_errstr(nt_status)));
return nt_status;
@@ -327,7 +329,9 @@ static void reply_nt1(struct smbsrv_request *req, uint16_t choice)
struct gensec_security *gensec_security;
DATA_BLOB null_data_blob = data_blob(NULL, 0);
DATA_BLOB blob;
- NTSTATUS nt_status = gensec_server_start(req->smb_conn, &gensec_security);
+ NTSTATUS nt_status = gensec_server_start(req->smb_conn,
+ &gensec_security,
+ req->smb_conn->connection->event.ctx);
if (req->smb_conn->negotiate.auth_context) {
smbsrv_terminate_connection(req->smb_conn, "reply_nt1: is this a secondary negprot? auth_context is non-NULL!\n");