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/samsync.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/samsync.c')
-rw-r--r-- | source4/torture/rpc/samsync.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c index 2efb16222b..f7800e28cc 100644 --- a/source4/torture/rpc/samsync.c +++ b/source4/torture/rpc/samsync.c @@ -138,7 +138,7 @@ static struct policy_handle *samsync_open_domain(TALLOC_CTX *mem_ctx, struct samr_String name; struct samr_OpenDomain o; struct samr_LookupDomain l; - struct policy_handle *domain_handle = talloc_p(mem_ctx, struct policy_handle); + struct policy_handle *domain_handle = talloc(mem_ctx, struct policy_handle); NTSTATUS nt_status; name.string = domain; @@ -705,8 +705,8 @@ static BOOL samsync_handle_secret(TALLOC_CTX *mem_ctx, struct samsync_state *sam { struct netr_DELTA_SECRET *secret = delta->delta_union.secret; const char *name = delta->delta_id_union.name; - struct samsync_secret *new = talloc_p(samsync_state, struct samsync_secret); - struct samsync_secret *old = talloc_p(mem_ctx, struct samsync_secret); + struct samsync_secret *new = talloc(samsync_state, struct samsync_secret); + struct samsync_secret *old = talloc(mem_ctx, struct samsync_secret); struct lsa_QuerySecret q; struct lsa_OpenSecret o; struct policy_handle sec_handle; @@ -868,7 +868,7 @@ static BOOL samsync_handle_trusted_domain(TALLOC_CTX *mem_ctx, struct samsync_st struct netr_DELTA_TRUSTED_DOMAIN *trusted_domain = delta->delta_union.trusted_domain; struct dom_sid *dom_sid = delta->delta_id_union.sid; - struct samsync_trusted_domain *new = talloc_p(samsync_state, struct samsync_trusted_domain); + struct samsync_trusted_domain *new = talloc(samsync_state, struct samsync_trusted_domain); struct lsa_OpenTrustedDomain t; struct policy_handle trustdom_handle; struct lsa_QueryTrustedDomainInfo q; @@ -1311,11 +1311,11 @@ BOOL torture_rpc_samsync(void) return False; } - samsync_state = talloc_zero_p(mem_ctx, struct samsync_state); + samsync_state = talloc_zero(mem_ctx, struct samsync_state); samsync_state->p_samr = torture_join_samr_pipe(join_ctx); - samsync_state->connect_handle = talloc_zero_p(samsync_state, struct policy_handle); - samsync_state->lsa_handle = talloc_zero_p(samsync_state, struct policy_handle); + samsync_state->connect_handle = talloc_zero(samsync_state, struct policy_handle); + samsync_state->lsa_handle = talloc_zero(samsync_state, struct policy_handle); c.in.system_name = NULL; c.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED; c.out.connect_handle = samsync_state->connect_handle; @@ -1336,7 +1336,7 @@ BOOL torture_rpc_samsync(void) s.in.domain_handle = domain_policy; s.in.level = 4; - s.in.info = talloc_p(mem_ctx, union samr_DomainInfo); + s.in.info = talloc(mem_ctx, union samr_DomainInfo); s.in.info->info4.comment.string = talloc_asprintf(mem_ctx, @@ -1469,7 +1469,7 @@ failed: torture_leave_domain(join_ctx); torture_leave_domain(join_ctx2); - talloc_destroy(mem_ctx); + talloc_free(mem_ctx); return ret; } |