diff options
author | Jeremy Allison <jra@samba.org> | 2007-04-27 23:18:41 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:44 -0500 |
commit | 12ba88574bf91bdcc4447bfc3d429b799064bfd9 (patch) | |
tree | 17f9b68292eb277da8c71871f8cad332c43d3a5a /source3/nsswitch/idmap.c | |
parent | fdc0b87083496ae9d6d9d3d1d1a71dddaca24da2 (diff) | |
download | samba-12ba88574bf91bdcc4447bfc3d429b799064bfd9.tar.gz samba-12ba88574bf91bdcc4447bfc3d429b799064bfd9.tar.bz2 samba-12ba88574bf91bdcc4447bfc3d429b799064bfd9.zip |
r22542: Move over to using the _strict varients of the talloc
calls. No functional changes. Looks bigger than it is :-).
Jeremy.
(This used to be commit f6fa3080fee1b20df9f1968500840a88cf0ee592)
Diffstat (limited to 'source3/nsswitch/idmap.c')
-rw-r--r-- | source3/nsswitch/idmap.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/nsswitch/idmap.c b/source3/nsswitch/idmap.c index 7589ee66ab..26fcc692e9 100644 --- a/source3/nsswitch/idmap.c +++ b/source3/nsswitch/idmap.c @@ -360,7 +360,7 @@ NTSTATUS idmap_init(void) } /* init domain */ - dom = talloc_zero(idmap_ctx, struct idmap_domain); + dom = TALLOC_ZERO_P(idmap_ctx, struct idmap_domain); IDMAP_CHECK_ALLOC(dom); dom->name = talloc_strdup(dom, dom_list[i]); @@ -464,7 +464,7 @@ NTSTATUS idmap_init(void) ( ! pri_dom_is_in_list) && lp_winbind_trusted_domains_only()) { - dom = talloc_zero(idmap_ctx, struct idmap_domain); + dom = TALLOC_ZERO_P(idmap_ctx, struct idmap_domain); IDMAP_CHECK_ALLOC(dom); dom->name = talloc_strdup(dom, lp_workgroup()); @@ -515,7 +515,7 @@ NTSTATUS idmap_init(void) } /**** automatically add idmap_passdb backend ****/ - dom = talloc_zero(idmap_ctx, struct idmap_domain); + dom = TALLOC_ZERO_P(idmap_ctx, struct idmap_domain); IDMAP_CHECK_ALLOC(dom); dom->name = talloc_strdup(dom, get_global_sam_name()); @@ -607,7 +607,7 @@ NTSTATUS idmap_init(void) if ( alloc_backend ) { - idmap_alloc_ctx = talloc_zero(idmap_ctx, struct idmap_alloc_context); + idmap_alloc_ctx = TALLOC_ZERO_P(idmap_ctx, struct idmap_alloc_context); IDMAP_CHECK_ALLOC(idmap_alloc_ctx); idmap_alloc_ctx->methods = get_alloc_methods(alloc_backends, alloc_backend); @@ -1026,9 +1026,9 @@ static NTSTATUS idmap_backends_sids_to_unixids(struct id_map **ids) /* split list per domain */ - dom_ids = talloc_zero_array(ctx, struct id_map **, num_domains); + dom_ids = TALLOC_ZERO_ARRAY(ctx, struct id_map **, num_domains); IDMAP_CHECK_ALLOC(dom_ids); - counters = talloc_zero_array(ctx, int, num_domains); + counters = TALLOC_ZERO_ARRAY(ctx, int, num_domains); /* partition the requests by domain */ @@ -1143,7 +1143,7 @@ NTSTATUS idmap_unixids_to_sids(struct id_map **ids) if ( ! bids) { /* alloc space for ids to be resolved by backends (realloc ten by ten) */ - bids = talloc_array(ctx, struct id_map *, 10); + bids = TALLOC_ARRAY(ctx, struct id_map *, 10); if ( ! bids) { DEBUG(1, ("Out of memory!\n")); talloc_free(ctx); @@ -1248,7 +1248,7 @@ NTSTATUS idmap_sids_to_unixids(struct id_map **ids) if ( ! bids) { /* alloc space for ids to be resolved by backends (realloc ten by ten) */ - bids = talloc_array(ctx, struct id_map *, 10); + bids = TALLOC_ARRAY(ctx, struct id_map *, 10); if ( ! bids) { DEBUG(1, ("Out of memory!\n")); talloc_free(ctx); |