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/libcli/security/security_descriptor.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/libcli/security/security_descriptor.c')
-rw-r--r-- | source4/libcli/security/security_descriptor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/libcli/security/security_descriptor.c b/source4/libcli/security/security_descriptor.c index 509ec1f343..bbfee31fbe 100644 --- a/source4/libcli/security/security_descriptor.c +++ b/source4/libcli/security/security_descriptor.c @@ -30,7 +30,7 @@ struct security_descriptor *security_descriptor_initialise(TALLOC_CTX *mem_ctx) { struct security_descriptor *sd; - sd = talloc_p(mem_ctx, struct security_descriptor); + sd = talloc(mem_ctx, struct security_descriptor); if (!sd) { return NULL; } @@ -72,7 +72,7 @@ NTSTATUS security_descriptor_dacl_add(struct security_descriptor *sd, const struct security_ace *ace) { if (sd->dacl == NULL) { - sd->dacl = talloc_p(sd, struct security_acl); + sd->dacl = talloc(sd, struct security_acl); if (sd->dacl == NULL) { return NT_STATUS_NO_MEMORY; } @@ -82,7 +82,7 @@ NTSTATUS security_descriptor_dacl_add(struct security_descriptor *sd, sd->dacl->aces = NULL; } - sd->dacl->aces = talloc_realloc_p(sd->dacl, sd->dacl->aces, + sd->dacl->aces = talloc_realloc(sd->dacl, sd->dacl->aces, struct security_ace, sd->dacl->num_aces+1); if (sd->dacl->aces == NULL) { return NT_STATUS_NO_MEMORY; @@ -257,7 +257,7 @@ struct security_descriptor *security_descriptor_create(TALLOC_CTX *mem_ctx, va_start(ap, group_sid); while ((sidstr = va_arg(ap, const char *))) { struct dom_sid *sid; - struct security_ace *ace = talloc_p(sd, struct security_ace); + struct security_ace *ace = talloc(sd, struct security_ace); NTSTATUS status; if (ace == NULL) { |