From 16940d8a8ecb46a6de9cf5c83da7d2f54030777b Mon Sep 17 00:00:00 2001 From: Christian Ambach Date: Tue, 8 Jan 2013 16:54:16 +0100 Subject: s3:modules use vfs_gpfs_getacl in gpfs_get_nfs4_acl as preparation to remove gpfs_getacl_alloc() Signed-off-by: Christian Ambach Reviewed-by: Andrew Bartlett --- source3/modules/vfs_gpfs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source3/modules') 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; } -- cgit