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/torture/rpc/epmapper.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/torture/rpc/epmapper.c')
-rw-r--r-- | source4/torture/rpc/epmapper.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c index 1f3c8968ca..4fcd0757f0 100644 --- a/source4/torture/rpc/epmapper.c +++ b/source4/torture/rpc/epmapper.c @@ -300,7 +300,7 @@ static BOOL test_Insert(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx) r.in.num_ents = 1; - r.in.entries = talloc_array_p(mem_ctx, struct epm_entry_t, 1); + r.in.entries = talloc_array(mem_ctx, struct epm_entry_t, 1); ZERO_STRUCT(r.in.entries[0].object); r.in.entries[0].annotation = "smbtorture endpoint"; status = dcerpc_parse_binding(mem_ctx, "ncalrpc:[SMBTORTURE]", &bd); @@ -309,7 +309,7 @@ static BOOL test_Insert(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx) return False; } - r.in.entries[0].tower = talloc_p(mem_ctx, struct epm_twr_t); + r.in.entries[0].tower = talloc(mem_ctx, struct epm_twr_t); status = dcerpc_binding_build_tower(mem_ctx, &bd, &r.in.entries[0].tower->tower); if (NT_STATUS_IS_ERR(status)) { @@ -343,7 +343,7 @@ static BOOL test_InqObject(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx) NTSTATUS status; struct epm_InqObject r; - r.in.epm_object = talloc_p(mem_ctx, struct GUID); + r.in.epm_object = talloc(mem_ctx, struct GUID); GUID_from_string(DCERPC_EPMAPPER_UUID, r.in.epm_object); status = dcerpc_epm_InqObject(p, mem_ctx, &r); @@ -384,7 +384,7 @@ BOOL torture_rpc_epmapper(void) ret = False; } - talloc_destroy(mem_ctx); + talloc_free(mem_ctx); torture_rpc_close(p); |