diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-12-03 06:24:38 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:06:18 -0500 |
| commit | 58c326809a816703dc516c3022c9c4dbb9d09445 (patch) | |
| tree | 3900a7b59edf075e09459e0bf5f85097396bd9aa /source4/torture/rpc | |
| parent | c9932a3a92dd7b8696e4e145c7d7e2c080b46ffb (diff) | |
| download | samba-58c326809a816703dc516c3022c9c4dbb9d09445.tar.gz samba-58c326809a816703dc516c3022c9c4dbb9d09445.tar.bz2 samba-58c326809a816703dc516c3022c9c4dbb9d09445.zip | |
r4052: fixed a bunch of code to use the type safe _p allocation macros
(This used to be commit 80d15fa3402a9d1183467463f6b21c0b674bc442)
Diffstat (limited to 'source4/torture/rpc')
| -rw-r--r-- | source4/torture/rpc/lsa.c | 4 | ||||
| -rw-r--r-- | source4/torture/rpc/samr.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c index 83fb02f9d3..f816b5dc1a 100644 --- a/source4/torture/rpc/lsa.c +++ b/source4/torture/rpc/lsa.c @@ -118,7 +118,7 @@ static BOOL test_LookupNames(struct dcerpc_pipe *p, sids.count = 0; sids.sids = NULL; - names = talloc(mem_ctx, tnames->count * sizeof(names[0])); + names = talloc_array_p(mem_ctx, struct lsa_String, tnames->count); for (i=0;i<tnames->count;i++) { init_lsa_String(&names[i], tnames->names[i].name.string); } @@ -160,7 +160,7 @@ static BOOL test_LookupNames2(struct dcerpc_pipe *p, sids.count = 0; sids.sids = NULL; - names = talloc(mem_ctx, tnames->count * sizeof(names[0])); + names = talloc_array_p(mem_ctx, struct lsa_String, tnames->count); for (i=0;i<tnames->count;i++) { init_lsa_String(&names[i], tnames->names[i].name.string); } diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index 0fa1bccace..c7456e2fda 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -2136,7 +2136,7 @@ static BOOL test_EnumDomainUsers(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, printf("Testing LookupNames\n"); n.in.domain_handle = handle; n.in.num_names = r.out.sam->count; - n.in.names = talloc(mem_ctx, r.out.sam->count * sizeof(struct samr_String)); + n.in.names = talloc_array_p(mem_ctx, struct samr_String, r.out.sam->count); for (i=0;i<r.out.sam->count;i++) { n.in.names[i] = r.out.sam->entries[i].name; } @@ -2150,7 +2150,7 @@ static BOOL test_EnumDomainUsers(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, printf("Testing LookupRids\n"); lr.in.domain_handle = handle; lr.in.num_rids = r.out.sam->count; - lr.in.rids = talloc(mem_ctx, r.out.sam->count * sizeof(uint32_t)); + lr.in.rids = talloc_array_p(mem_ctx, uint32_t, r.out.sam->count); for (i=0;i<r.out.sam->count;i++) { lr.in.rids[i] = r.out.sam->entries[i].idx; } |