diff options
| author | Jeremy Allison <jra@samba.org> | 2007-04-30 02:51:26 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:49 -0500 |
| commit | 56a5d05b8b285250bdc0e9cc3c8f3c3d8af80382 (patch) | |
| tree | fe800dc017985b616874b79ffad6122a1e5bde34 /source3/nsswitch/idmap.c | |
| parent | be8b0685a55700c6bce3681734800ec6434b0364 (diff) | |
| download | samba-56a5d05b8b285250bdc0e9cc3c8f3c3d8af80382.tar.gz samba-56a5d05b8b285250bdc0e9cc3c8f3c3d8af80382.tar.bz2 samba-56a5d05b8b285250bdc0e9cc3c8f3c3d8af80382.zip | |
r22590: Make TALLOC_ARRAY consistent across all uses.
That should be it....
Jeremy.
(This used to be commit 603233a98bbf65467c8b4f04719d771c70b3b4c9)
Diffstat (limited to 'source3/nsswitch/idmap.c')
| -rw-r--r-- | source3/nsswitch/idmap.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source3/nsswitch/idmap.c b/source3/nsswitch/idmap.c index 26fcc692e9..5222eba8f3 100644 --- a/source3/nsswitch/idmap.c +++ b/source3/nsswitch/idmap.c @@ -1026,9 +1026,15 @@ 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); - IDMAP_CHECK_ALLOC(dom_ids); - counters = TALLOC_ZERO_ARRAY(ctx, int, num_domains); + if (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); + IDMAP_CHECK_ALLOC(counters); + } else { + dom_ids = NULL; + counters = NULL; + } /* partition the requests by domain */ |