summaryrefslogtreecommitdiff
path: root/source4/smb_server
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2005-10-17 15:08:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:44:53 -0500
commit929de6af34d4d0d7be5a44436d180bc77ddb1dbb (patch)
treef182b709b6090ee3d23ae4bd005e546944c2b54d /source4/smb_server
parentc4927c843d463f832f8fa49578c86c801e21f499 (diff)
downloadsamba-929de6af34d4d0d7be5a44436d180bc77ddb1dbb.tar.gz
samba-929de6af34d4d0d7be5a44436d180bc77ddb1dbb.tar.bz2
samba-929de6af34d4d0d7be5a44436d180bc77ddb1dbb.zip
r11120: calling_name is used later in sesssetup_nt1, so hang the names to the right
talloc context. Volker (This used to be commit 256cf928d786b2533953505aea20ec80a25c6929)
Diffstat (limited to 'source4/smb_server')
-rw-r--r--source4/smb_server/reply.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/smb_server/reply.c b/source4/smb_server/reply.c
index a52616a727..03f9f58983 100644
--- a/source4/smb_server/reply.c
+++ b/source4/smb_server/reply.c
@@ -2392,14 +2392,16 @@ static NTSTATUS parse_session_request(struct smbsrv_request *req)
return NT_STATUS_NO_MEMORY;
}
- status = nbt_name_from_blob(req, &blob, req->smb_conn->negotiate.called_name);
+ status = nbt_name_from_blob(req->smb_conn, &blob,
+ req->smb_conn->negotiate.called_name);
NT_STATUS_NOT_OK_RETURN(status);
blob.data += blob.length;
blob.length = ascii_len_n(blob.data, req->in.size - PTR_DIFF(blob.data, req->in.buffer));
if (blob.length == 0) return NT_STATUS_BAD_NETWORK_NAME;
- status = nbt_name_from_blob(req, &blob, req->smb_conn->negotiate.calling_name);
+ status = nbt_name_from_blob(req->smb_conn, &blob,
+ req->smb_conn->negotiate.calling_name);
NT_STATUS_NOT_OK_RETURN(status);
req->smb_conn->negotiate.done_nbt_session = True;