summaryrefslogtreecommitdiff
path: root/source4/smb_server
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-09-25 12:08:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:59:14 -0500
commitc5f4378361b9671e39fa83b043f28c972ab30b70 (patch)
tree455519b7d5590d151cf1f2291ca99f8fc77234bb /source4/smb_server
parent223e78990a16f134a01d1223a0dad8b2accd5fed (diff)
downloadsamba-c5f4378361b9671e39fa83b043f28c972ab30b70.tar.gz
samba-c5f4378361b9671e39fa83b043f28c972ab30b70.tar.bz2
samba-c5f4378361b9671e39fa83b043f28c972ab30b70.zip
r2629: convert gensec to the new talloc model
by making our gensec structures a talloc child of the open connection we can be sure that it will be destroyed when the connection is dropped. (This used to be commit f12ee2f241aab1549bc1d9ca4c35a35a1ca0d09d)
Diffstat (limited to 'source4/smb_server')
-rw-r--r--source4/smb_server/negprot.c2
-rw-r--r--source4/smb_server/sesssetup.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/smb_server/negprot.c b/source4/smb_server/negprot.c
index 25ab1ab4a9..576fcc22bf 100644
--- a/source4/smb_server/negprot.c
+++ b/source4/smb_server/negprot.c
@@ -306,7 +306,7 @@ 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(&gensec_security);
+ NTSTATUS nt_status = gensec_server_start(req->smb_conn, &gensec_security);
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");
diff --git a/source4/smb_server/sesssetup.c b/source4/smb_server/sesssetup.c
index aeae404d6a..4cb0447d32 100644
--- a/source4/smb_server/sesssetup.c
+++ b/source4/smb_server/sesssetup.c
@@ -221,7 +221,7 @@ static NTSTATUS sesssetup_spnego(struct smbsrv_request *req, union smb_sesssetup
status = gensec_update(smb_sess->gensec_ctx, req, sess->spnego.in.secblob, &sess->spnego.out.secblob);
} else {
- status = gensec_server_start(&gensec_ctx);
+ status = gensec_server_start(req->smb_conn, &gensec_ctx);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(1, ("Failed to start GENSEC server code: %s\n", nt_errstr(status)));
return status;