diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-27 07:08:20 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:15 -0500 |
| commit | 759da3b915e2006d4c87b5ace47f399accd9ce91 (patch) | |
| tree | 6bcaf9d4c0e38ef5e975c041d442c4437aa61e5a /source4/smb_server/nttrans.c | |
| parent | 1e42cacf6a8643bd633f631c212d71760852abbc (diff) | |
| download | samba-759da3b915e2006d4c87b5ace47f399accd9ce91.tar.gz samba-759da3b915e2006d4c87b5ace47f399accd9ce91.tar.bz2 samba-759da3b915e2006d4c87b5ace47f399accd9ce91.zip | |
r5037: got rid of all of the TALLOC_DEPRECATED stuff. My apologies for the
large commit. I thought this was worthwhile to get done for
consistency.
(This used to be commit ec32b22ed5ec224f6324f5e069d15e92e38e15c0)
Diffstat (limited to 'source4/smb_server/nttrans.c')
| -rw-r--r-- | source4/smb_server/nttrans.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/smb_server/nttrans.c b/source4/smb_server/nttrans.c index 5875554258..9a3b919d8b 100644 --- a/source4/smb_server/nttrans.c +++ b/source4/smb_server/nttrans.c @@ -66,7 +66,7 @@ static NTSTATUS nttrans_create(struct smbsrv_request *req, } /* parse the request */ - io = talloc_p(req, union smb_open); + io = talloc(req, union smb_open); if (io == NULL) { return NT_STATUS_NO_MEMORY; } @@ -110,7 +110,7 @@ static NTSTATUS nttrans_create(struct smbsrv_request *req, DATA_BLOB blob; blob.data = trans->in.data.data; blob.length = sd_length; - io->ntcreatex.in.sec_desc = talloc_p(io, struct security_descriptor); + io->ntcreatex.in.sec_desc = talloc(io, struct security_descriptor); if (io->ntcreatex.in.sec_desc == NULL) { return NT_STATUS_NO_MEMORY; } @@ -127,7 +127,7 @@ static NTSTATUS nttrans_create(struct smbsrv_request *req, DATA_BLOB blob; blob.data = trans->in.data.data + sd_length; blob.length = ea_length; - io->ntcreatex.in.ea_list = talloc_p(io, struct smb_ea_list); + io->ntcreatex.in.ea_list = talloc(io, struct smb_ea_list); if (io->ntcreatex.in.ea_list == NULL) { return NT_STATUS_NO_MEMORY; } @@ -190,7 +190,7 @@ static NTSTATUS nttrans_query_sec_desc(struct smbsrv_request *req, } /* parse the request */ - io = talloc_p(req, union smb_fileinfo); + io = talloc(req, union smb_fileinfo); if (io == NULL) { return NT_STATUS_NO_MEMORY; } @@ -238,7 +238,7 @@ static NTSTATUS nttrans_set_sec_desc(struct smbsrv_request *req, } /* parse the request */ - io = talloc_p(req, union smb_setfileinfo); + io = talloc(req, union smb_setfileinfo); if (io == NULL) { return NT_STATUS_NO_MEMORY; } @@ -247,7 +247,7 @@ static NTSTATUS nttrans_set_sec_desc(struct smbsrv_request *req, io->set_secdesc.file.fnum = SVAL(trans->in.params.data, 0); io->set_secdesc.in.secinfo_flags = IVAL(trans->in.params.data, 4); - io->set_secdesc.in.sd = talloc_p(io, struct security_descriptor); + io->set_secdesc.in.sd = talloc(io, struct security_descriptor); if (io->set_secdesc.in.sd == NULL) { return NT_STATUS_NO_MEMORY; } @@ -383,7 +383,7 @@ void reply_nttrans(struct smbsrv_request *req) } /* parse out the setup words */ - trans.in.setup = talloc_array_p(req, uint16_t, trans.in.setup_count); + trans.in.setup = talloc_array(req, uint16_t, trans.in.setup_count); if (!trans.in.setup) { req_reply_error(req, NT_STATUS_NO_MEMORY); return; |