summaryrefslogtreecommitdiff
path: root/source4/libads
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-12-03 06:24:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:06:18 -0500
commit58c326809a816703dc516c3022c9c4dbb9d09445 (patch)
tree3900a7b59edf075e09459e0bf5f85097396bd9aa /source4/libads
parentc9932a3a92dd7b8696e4e145c7d7e2c080b46ffb (diff)
downloadsamba-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/libads')
-rw-r--r--source4/libads/ldap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/libads/ldap.c b/source4/libads/ldap.c
index 9de73fcd0a..d4b363cae6 100644
--- a/source4/libads/ldap.c
+++ b/source4/libads/ldap.c
@@ -1592,7 +1592,7 @@ char **ads_pull_strings(ADS_STRUCT *ads,
*num_values = ldap_count_values(values);
- ret = talloc(mem_ctx, sizeof(char *) * (*num_values+1));
+ ret = talloc_array_p(mem_ctx, char *, *num_values+1);
if (!ret) {
ldap_value_free(values);
return NULL;
@@ -1839,7 +1839,7 @@ int ads_pull_sids(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx,
for (i=0; values[i]; i++)
/* nop */ ;
- (*sids) = talloc(mem_ctx, sizeof(DOM_SID) * i);
+ (*sids) = talloc_array_p(mem_ctx, DOM_SID, i);
if (!(*sids)) {
ldap_value_free_len(values);
return 0;