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/rpc_server/dcom | |
| 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/rpc_server/dcom')
| -rw-r--r-- | source4/rpc_server/dcom/remact.c | 4 | ||||
| -rw-r--r-- | source4/rpc_server/dcom/rot.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source4/rpc_server/dcom/remact.c b/source4/rpc_server/dcom/remact.c index 30e508d65b..506417d7e4 100644 --- a/source4/rpc_server/dcom/remact.c +++ b/source4/rpc_server/dcom/remact.c @@ -55,8 +55,8 @@ static WERROR RemoteActivation(struct dcesrv_call_state *dce_call, TALLOC_CTX *m /* FIXME: Loop thru given interfaces and set r->out.results and * r->out.interfaces */ - r->out.ifaces = talloc_array_p(mem_ctx, struct pMInterfacePointer, r->in.Interfaces); - r->out.results = talloc_array_p(mem_ctx, WERROR, r->in.Interfaces); + r->out.ifaces = talloc_array(mem_ctx, struct pMInterfacePointer, r->in.Interfaces); + r->out.results = talloc_array(mem_ctx, WERROR, r->in.Interfaces); r->out.hr = cr->out.result; for (i = 0; i < r->in.Interfaces; i++) { diff --git a/source4/rpc_server/dcom/rot.c b/source4/rpc_server/dcom/rot.c index 04fb7c73a5..f36eaf20d1 100644 --- a/source4/rpc_server/dcom/rot.c +++ b/source4/rpc_server/dcom/rot.c @@ -33,7 +33,7 @@ static WERROR rot_add(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, { struct tdb_wrap *db = openrodb(mem_ctx); DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); - talloc_destroy(db); + talloc_free(db); } @@ -45,7 +45,7 @@ static WERROR rot_remove(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx { struct tdb_wrap *db = openrodb(mem_ctx); DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); - talloc_destroy(db); + talloc_free(db); } @@ -57,7 +57,7 @@ static WERROR rot_is_listed(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ { struct tdb_wrap *db = openrodb(mem_ctx); DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); - talloc_destroy(db); + talloc_free(db); } @@ -69,7 +69,7 @@ static WERROR rot_get_interface_pointer(struct dcesrv_call_state *dce_call, TALL { struct tdb_wrap *db = openrodb(mem_ctx); DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); - talloc_destroy(db); + talloc_free(db); } @@ -81,7 +81,7 @@ static WERROR rot_set_modification_time(struct dcesrv_call_state *dce_call, TALL { struct tdb_wrap *db = openrodb(mem_ctx); DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); - talloc_destroy(db); + talloc_free(db); } @@ -93,7 +93,7 @@ static WERROR rot_get_modification_time(struct dcesrv_call_state *dce_call, TALL { struct tdb_wrap *db = openrodb(mem_ctx); DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); - talloc_destroy(db); + talloc_free(db); } @@ -105,7 +105,7 @@ static WERROR rot_enum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, { struct tdb_wrap *db = openrodb(mem_ctx); DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); - talloc_destroy(db); + talloc_free(db); } |