diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-01-14 12:38:36 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-01-31 20:17:10 +0100 |
| commit | 5f79ad5f8718fec99f209590f088bafb998f1c9c (patch) | |
| tree | afd8665ee9b633fbdaaa7d1fcba7518c433d4c41 | |
| parent | ec0142dd3197a9cd429ee925486d2fc87509706f (diff) | |
| download | samba-5f79ad5f8718fec99f209590f088bafb998f1c9c.tar.gz samba-5f79ad5f8718fec99f209590f088bafb998f1c9c.tar.bz2 samba-5f79ad5f8718fec99f209590f088bafb998f1c9c.zip | |
s3:smbd: the spnego session setup don't need to copy the in blob
metze
| -rw-r--r-- | source3/smbd/sesssetup.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index a42d0d0a48..d6f45d9c34 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -207,7 +207,7 @@ static void reply_spnego_generic(struct smb_request *req, static void reply_sesssetup_and_X_spnego(struct smb_request *req) { const uint8 *p; - DATA_BLOB blob1; + DATA_BLOB in_blob; size_t bufrem; char *tmp; const char *native_os; @@ -243,13 +243,13 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req) bufrem = smbreq_bufrem(req, p); /* pull the spnego blob */ - blob1 = data_blob(p, MIN(bufrem, data_blob_len)); + in_blob = data_blob_const(p, MIN(bufrem, data_blob_len)); #if 0 - file_save("negotiate.dat", blob1.data, blob1.length); + file_save("negotiate.dat", in_blob.data, in_blob.length); #endif - p2 = (const char *)req->buf + blob1.length; + p2 = (const char *)req->buf + in_blob.length; p2 += srvstr_pull_req_talloc(talloc_tos(), req, &tmp, p2, STR_TERMINATE); @@ -291,7 +291,6 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req) /* No, start a new authentication setup. */ vuid = register_initial_vuid(sconn); if (vuid == UID_FIELD_INVALID) { - data_blob_free(&blob1); reply_nterror(req, nt_status_squash( NT_STATUS_INVALID_PARAMETER)); return; @@ -310,7 +309,6 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req) if (!NT_STATUS_IS_OK(status)) { /* Kill the intermediate vuid */ invalidate_vuid(sconn, vuid); - data_blob_free(&blob1); reply_nterror(req, nt_status_squash(status)); return; } @@ -326,7 +324,6 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req) if (!NT_STATUS_IS_OK(status)) { /* Kill the intermediate vuid */ invalidate_vuid(sconn, vuid); - data_blob_free(&blob1); reply_nterror(req, nt_status_squash(status)); return; } @@ -334,9 +331,7 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req) status = gensec_update(vuser->gensec_security, talloc_tos(), NULL, - blob1, &chal); - - data_blob_free(&blob1); + in_blob, &chal); reply_spnego_generic(req, vuid, &vuser->gensec_security, |