s3:modules use vfs_gpfs_getacl in gpfs_get_nfs4_acl
authorChristian Ambach <ambi@samba.org>
Tue, 8 Jan 2013 15:54:16 +0000 (16:54 +0100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 4 Feb 2013 11:19:30 +0000 (12:19 +0100)
as preparation to remove gpfs_getacl_alloc()

Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
source3/modules/vfs_gpfs.c

index d098bdee04c4a5e4e9fb1c0971a4109f2bbc14dc..8417a6c153dae0cbaaa6287e9c90e02b390bb4ce 100644 (file)
@@ -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;
 }