diff options
| author | Jeremy Allison <jra@samba.org> | 2007-04-30 02:39:34 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:49 -0500 |
| commit | be8b0685a55700c6bce3681734800ec6434b0364 (patch) | |
| tree | 8616d85686fb147d431eeea435233f45d5ee8d41 /source3/modules | |
| parent | 79de0ad9463a5cd64978beae37df79fbb4f74632 (diff) | |
| download | samba-be8b0685a55700c6bce3681734800ec6434b0364.tar.gz samba-be8b0685a55700c6bce3681734800ec6434b0364.tar.bz2 samba-be8b0685a55700c6bce3681734800ec6434b0364.zip | |
r22589: Make TALLOC_ARRAY consistent across all uses.
Jeremy.
(This used to be commit 8968808c3b5b0208cbad9ac92eaf948f2c546dd9)
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_afsacl.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c index 43fa537d73..a82e6b350b 100644 --- a/source3/modules/vfs_afsacl.c +++ b/source3/modules/vfs_afsacl.c @@ -616,10 +616,14 @@ static size_t afs_to_nt_acl(struct afs_acl *afs_acl, uid_to_sid(&owner_sid, sbuf.st_uid); gid_to_sid(&group_sid, sbuf.st_gid); - nt_ace_list = TALLOC_ARRAY(mem_ctx, SEC_ACE, afs_acl->num_aces); + if (num_aces) { + nt_ace_list = TALLOC_ARRAY(mem_ctx, SEC_ACE, afs_acl->num_aces); - if (nt_ace_list == NULL) - return 0; + if (nt_ace_list == NULL) + return 0; + } else { + nt_ace_list = NULL; + } afs_ace = afs_acl->acelist; good_aces = 0; |