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)

3 files changed, 13 insertions, 13 deletions

diff --git a/source4/libcli/security/dom_sid.c b/source4/libcli/security/dom_sid.c
index d76f9fa239..493ecab183 100644
--- a/source4/libcli/security/dom_sid.c
+++ b/source4/libcli/security/dom_sid.c
@@ -149,12 +149,12 @@ struct dom_sid *dom_sid_parse_talloc(TALLOC_CTX *mem_ctx, const char *sidstr)
 		if (sidstr[i] == '-') num_sub_auths++;
 	}
 
-	ret = talloc_p(mem_ctx, struct dom_sid);
+	ret = talloc(mem_ctx, struct dom_sid);
 	if (!ret) {
 		return NULL;
 	}
 
-	ret->sub_auths = talloc_array_p(mem_ctx, uint32_t, num_sub_auths);
+	ret->sub_auths = talloc_array(mem_ctx, uint32_t, num_sub_auths);
 	if (!ret->sub_auths) {
 		return NULL;
 	}
@@ -190,12 +190,12 @@ struct dom_sid *dom_sid_dup(TALLOC_CTX *mem_ctx, const struct dom_sid *dom_sid)
 {
 	struct dom_sid *ret;
 	int i;
-	ret = talloc_p(mem_ctx, struct dom_sid);
+	ret = talloc(mem_ctx, struct dom_sid);
 	if (!ret) {
 		return NULL;
 	}
 
-	ret->sub_auths = talloc_array_p(ret, uint32_t, dom_sid->num_auths);
+	ret->sub_auths = talloc_array(ret, uint32_t, dom_sid->num_auths);
 	if (!ret->sub_auths) {
 		return NULL;
 	}
@@ -226,12 +226,12 @@ struct dom_sid *dom_sid_add_rid(TALLOC_CTX *mem_ctx,
 {
 	struct dom_sid *sid;
 
-	sid = talloc_p(mem_ctx, struct dom_sid);
+	sid = talloc(mem_ctx, struct dom_sid);
 	if (!sid) return NULL;
 
 	*sid = *domain_sid;
 
-	sid->sub_auths = talloc_array_p(sid, uint32_t, sid->num_auths+1);
+	sid->sub_auths = talloc_array(sid, uint32_t, sid->num_auths+1);
 	if (!sid->sub_auths) {
 		return NULL;
 	}
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) {
diff --git a/source4/libcli/security/security_token.c b/source4/libcli/security/security_token.c
index b9baf796df..663c4f28bc 100644
--- a/source4/libcli/security/security_token.c
+++ b/source4/libcli/security/security_token.c
@@ -31,7 +31,7 @@ struct security_token *security_token_initialise(TALLOC_CTX *mem_ctx)
 {
 	struct security_token *st;
 
-	st = talloc_p(mem_ctx, struct security_token);
+	st = talloc(mem_ctx, struct security_token);
 	if (!st) {
 		return NULL;
 	}
@@ -63,7 +63,7 @@ NTSTATUS security_token_create(TALLOC_CTX *mem_ctx,
 	ptoken = security_token_initialise(mem_ctx);
 	NT_STATUS_HAVE_NO_MEMORY(ptoken);
 
-	ptoken->sids = talloc_array_p(ptoken, struct dom_sid *, n_groupSIDs + 5);
+	ptoken->sids = talloc_array(ptoken, struct dom_sid *, n_groupSIDs + 5);
 	NT_STATUS_HAVE_NO_MEMORY(ptoken->sids);
 
 	ptoken->user_sid = talloc_reference(ptoken, user_sid);
@@ -163,5 +163,5 @@ void security_token_debug(int dbg_lev, const struct security_token *token)
 		}
 	}
 
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 }