diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-09-08 05:39:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:58:34 -0500 |
| commit | 893c62d38388b20c52cf3c45069d836c46f42bd3 (patch) | |
| tree | b11304934190db80fd453089a88ff18ec4728bba /source4/smb_server/trans2.c | |
| parent | 8293df91bcec574fb4a2b290cc11dd83353264ae (diff) | |
| download | samba-893c62d38388b20c52cf3c45069d836c46f42bd3.tar.gz samba-893c62d38388b20c52cf3c45069d836c46f42bd3.tar.bz2 samba-893c62d38388b20c52cf3c45069d836c46f42bd3.zip | |
r2249: got rid of some more mem_ctx elements in structures
(This used to be commit 21ef338cbbe96acc8594ffc550ef60c6a40fb951)
Diffstat (limited to 'source4/smb_server/trans2.c')
| -rw-r--r-- | source4/smb_server/trans2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/smb_server/trans2.c b/source4/smb_server/trans2.c index c8b73ca4c6..57a385fe27 100644 --- a/source4/smb_server/trans2.c +++ b/source4/smb_server/trans2.c @@ -73,10 +73,10 @@ static void trans2_setup_reply(struct smbsrv_request *req, { trans->out.setup_count = setup_count; if (setup_count != 0) { - trans->out.setup = talloc_zero(req->mem_ctx, sizeof(uint16_t) * setup_count); + trans->out.setup = talloc_zero(req, sizeof(uint16_t) * setup_count); } - trans->out.params = data_blob_talloc(req->mem_ctx, NULL, param_size); - trans->out.data = data_blob_talloc(req->mem_ctx, NULL, data_size); + trans->out.params = data_blob_talloc(req, NULL, param_size); + trans->out.data = data_blob_talloc(req, NULL, data_size); } @@ -371,7 +371,7 @@ static NTSTATUS trans2_qfsinfo(struct smbsrv_request *req, struct smb_trans2 *tr trans2_setup_reply(req, trans, 0, 64, 0); - status = ndr_push_struct_blob(&guid_blob, req->mem_ctx, + status = ndr_push_struct_blob(&guid_blob, req, &fsinfo.objectid_information.out.guid, (ndr_push_flags_fn_t)ndr_push_GUID); if (!NT_STATUS_IS_OK(status)) { @@ -722,7 +722,7 @@ static NTSTATUS trans2_parse_sfileinfo(struct smbsrv_request *req, DATA_BLOB blob2; blob2.data = blob->data+4; blob2.length = len-4; - len = ea_pull_struct(&blob2, req->mem_ctx, &st->ea_set.in.ea); + len = ea_pull_struct(&blob2, req, &st->ea_set.in.ea); } if (len == 0) { return NT_STATUS_INVALID_PARAMETER; @@ -1275,7 +1275,7 @@ void reply_trans_generic(struct smbsrv_request *req, uint8_t command) } /* parse out the setup words */ - trans.in.setup = talloc(req->mem_ctx, trans.in.setup_count * sizeof(uint16_t)); + trans.in.setup = talloc(req, trans.in.setup_count * sizeof(uint16_t)); if (trans.in.setup_count && !trans.in.setup) { req_reply_error(req, NT_STATUS_NO_MEMORY); return; |