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/lib/registry/reg_backend_nt4.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/lib/registry/reg_backend_nt4.c')
-rw-r--r-- | source4/lib/registry/reg_backend_nt4.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/registry/reg_backend_nt4.c b/source4/lib/registry/reg_backend_nt4.c index cd3be85a23..88033a8a8b 100644 --- a/source4/lib/registry/reg_backend_nt4.c +++ b/source4/lib/registry/reg_backend_nt4.c @@ -902,7 +902,7 @@ static WERROR vk_to_val(TALLOC_CTX *mem_ctx, struct registry_key *parent, VK_HDR dat_len = IVAL(&vk_hdr->dat_len,0); /* If top bit, offset contains data */ dat_off = IVAL(&vk_hdr->dat_off,0); - tmp = talloc_p(mem_ctx, struct registry_value); + tmp = talloc(mem_ctx, struct registry_value); tmp->data_type = dat_type; if (flag & FLAG_HAS_NAME) { @@ -1070,7 +1070,7 @@ static WERROR nk_to_key(TALLOC_CTX *mem_ctx, struct registry_hive *h, NK_HDR *nk return WERR_GENERAL_FAILURE; } - tmp = talloc_p(mem_ctx, struct registry_key); + tmp = talloc(mem_ctx, struct registry_key); tmp->name = talloc_strdup(mem_ctx, key_name); tmp->backend_data = nk_hdr; @@ -1574,7 +1574,7 @@ static WERROR nt_open_hive (struct registry_hive *h, struct registry_key **key) uint_t regf_id, hbin_id; HBIN_HDR *hbin_hdr; - regf = (REGF *)talloc_p(h, REGF); + regf = (REGF *)talloc(h, REGF); memset(regf, 0, sizeof(REGF)); regf->owner_sid_str = NULL; /* FIXME: Fill in */ h->backend_data = regf; |