From 58c326809a816703dc516c3022c9c4dbb9d09445 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 3 Dec 2004 06:24:38 +0000
Subject: r4052: fixed a bunch of code to use the type safe _p allocation
 macros (This used to be commit 80d15fa3402a9d1183467463f6b21c0b674bc442)

---
 source4/librpc/idl/security.idl  | 2 +-
 source4/librpc/ndr/ndr.c         | 2 +-
 source4/librpc/rpc/dcerpc_auth.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/librpc')

diff --git a/source4/librpc/idl/security.idl b/source4/librpc/idl/security.idl
index 1ef1783073..90ae3d3028 100644
--- a/source4/librpc/idl/security.idl
+++ b/source4/librpc/idl/security.idl
@@ -184,7 +184,7 @@ interface security
 	typedef [public] struct {
 		uint16 revision;
 		[value(ndr_size_security_acl(r))] uint16 size;
-		uint32 num_aces;
+		[range(0,1000)] uint32 num_aces;
 		security_ace aces[num_aces];
 	} security_acl;
 
diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c
index 71019030ac..857e171224 100644
--- a/source4/librpc/ndr/ndr.c
+++ b/source4/librpc/ndr/ndr.c
@@ -125,7 +125,7 @@ struct ndr_push *ndr_push_init_ctx(TALLOC_CTX *mem_ctx)
 {
 	struct ndr_push *ndr;
 
-	ndr = talloc(mem_ctx, sizeof(*ndr));
+	ndr = talloc_p(mem_ctx, struct ndr_push);
 	if (!ndr) {
 		return NULL;
 	}
diff --git a/source4/librpc/rpc/dcerpc_auth.c b/source4/librpc/rpc/dcerpc_auth.c
index 7e581992fa..844746e322 100644
--- a/source4/librpc/rpc/dcerpc_auth.c
+++ b/source4/librpc/rpc/dcerpc_auth.c
@@ -70,7 +70,7 @@ NTSTATUS dcerpc_bind_auth3(struct dcerpc_pipe *p, uint8_t auth_type, uint8_t aut
 		}
 	}
 
-	p->security_state.auth_info = talloc(p, sizeof(*p->security_state.auth_info));
+	p->security_state.auth_info = talloc_p(p, struct dcerpc_auth);
 	if (!p->security_state.auth_info) {
 		status = NT_STATUS_NO_MEMORY;
 		goto done;
@@ -150,7 +150,7 @@ NTSTATUS dcerpc_bind_alter(struct dcerpc_pipe *p, uint8_t auth_type, uint8_t aut
 		}
 	}
 
-	p->security_state.auth_info = talloc(p, sizeof(*p->security_state.auth_info));
+	p->security_state.auth_info = talloc_p(p, struct dcerpc_auth);
 	if (!p->security_state.auth_info) {
 		status = NT_STATUS_NO_MEMORY;
 		goto done;
-- 
cgit