diff options
| author | Jeremy Allison <jra@samba.org> | 2010-07-19 16:45:16 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-07-19 16:45:16 -0700 |
| commit | 8cba4a0c9639c48ec2433a98529bd8352e9d06c9 (patch) | |
| tree | 9cf2522fea2214e8cc11f23d5a4e904b7202357d /source3/smbd/smb2_negprot.c | |
| parent | 625a51138916473eacc1447b11ffd93db0832077 (diff) | |
| download | samba-8cba4a0c9639c48ec2433a98529bd8352e9d06c9.tar.gz samba-8cba4a0c9639c48ec2433a98529bd8352e9d06c9.tar.bz2 samba-8cba4a0c9639c48ec2433a98529bd8352e9d06c9.zip | |
Move the addition of the 16 byte guid out of spnego_gen_negTokenInit() and
into negprot_spnego() where it belongs (it's not an SPNEGO operation).
Add a TALLOC_CTX for callers of negprot_spnego(). Closer to unifying all
the gen_negTokenXXX calls.
Jeremy.
Diffstat (limited to 'source3/smbd/smb2_negprot.c')
| -rw-r--r-- | source3/smbd/smb2_negprot.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c index fc20eac82c..db392f4075 100644 --- a/source3/smbd/smb2_negprot.c +++ b/source3/smbd/smb2_negprot.c @@ -119,11 +119,10 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req) } /* negprot_spnego() returns a the server guid in the first 16 bytes */ - negprot_spnego_blob = negprot_spnego(req->sconn); + negprot_spnego_blob = negprot_spnego(req, req->sconn); if (negprot_spnego_blob.data == NULL) { return smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY); } - talloc_steal(req, negprot_spnego_blob.data); if (negprot_spnego_blob.length < 16) { return smbd_smb2_request_error(req, NT_STATUS_INTERNAL_ERROR); |