s3: VFS: Change SMB_VFS_SYS_ACL_SET_FILE to use const struct smb_filename * instead...

[kai/samba-autobuild/.git] / source3 / modules / vfs_acl_xattr.c

diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c
index 96bd0166655bae5d0c74f7248941532af58954b6..1dc70824bf573cb49fa332b6604c99c4539b5bc4 100644 (file)
--- a/source3/modules/vfs_acl_xattr.c
+++ b/source3/modules/vfs_acl_xattr.c
@@ -168,12 +168,12 @@ static NTSTATUS store_acl_blob_fsp(vfs_handle_struct *handle,
 *********************************************************************/
 
 static int sys_acl_set_file_xattr(vfs_handle_struct *handle,
-                              const char *name,
-                              SMB_ACL_TYPE_T type,
-                              SMB_ACL_T theacl)
+                               const struct smb_filename *smb_fname,
+                               SMB_ACL_TYPE_T type,
+                               SMB_ACL_T theacl)
 {
        int ret = SMB_VFS_NEXT_SYS_ACL_SET_FILE(handle,
-                                               name,
+                                               smb_fname,
                                                type,
                                                theacl);
        if (ret == -1) {
@@ -181,7 +181,8 @@ static int sys_acl_set_file_xattr(vfs_handle_struct *handle,
        }
 
        become_root();
-       SMB_VFS_REMOVEXATTR(handle->conn, name, XATTR_NTACL_NAME);
+       SMB_VFS_REMOVEXATTR(handle->conn, smb_fname->base_name,
+                       XATTR_NTACL_NAME);
        unbecome_root();
 
        return ret;