summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ambach <ambi@samba.org>2013-01-08 16:54:16 +0100
committerAndrew Bartlett <abartlet@samba.org>2013-02-04 12:19:30 +0100
commit16940d8a8ecb46a6de9cf5c83da7d2f54030777b (patch)
tree34de4b5875906788add40f782d99ea730f78901b
parent940b7ec78c50c41a399bee2775cd008618baf8f8 (diff)
downloadsamba-16940d8a8ecb46a6de9cf5c83da7d2f54030777b.tar.gz
samba-16940d8a8ecb46a6de9cf5c83da7d2f54030777b.tar.bz2
samba-16940d8a8ecb46a6de9cf5c83da7d2f54030777b.zip
s3:modules use vfs_gpfs_getacl in gpfs_get_nfs4_acl
as preparation to remove gpfs_getacl_alloc() Signed-off-by: Christian Ambach <ambi@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source3/modules/vfs_gpfs.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index d098bdee04..8417a6c153 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -351,8 +351,9 @@ static int gpfs_get_nfs4_acl(const char *fname, SMB4ACL_T **ppacl)
struct gpfs_acl *gacl = NULL;
DEBUG(10, ("gpfs_get_nfs4_acl invoked for %s\n", fname));
- /* First get the real acl length */
- gacl = gpfs_getacl_alloc(fname, 0);
+ /* Get the ACL */
+ gacl = (struct gpfs_acl*) vfs_gpfs_getacl(talloc_tos(), fname,
+ false, 0);
if (gacl == NULL) {
DEBUG(9, ("gpfs_getacl failed for %s with %s\n",
fname, strerror(errno)));
@@ -423,6 +424,8 @@ static int gpfs_get_nfs4_acl(const char *fname, SMB4ACL_T **ppacl)
smb_add_ace4(*ppacl, &smbace);
}
+ talloc_free(gacl);
+
return 0;
}