s3: VFS: vfs_acl_xattr: Don't call unlink_acl_common() directly.

Use a wrapper function so we can change the parameters.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c
index 80779cd9577ee74368c23180bf7a3a93f1324bee..82eef211b4b69103bafcc5eee3e57b3d03e12438 100644 (file)
--- a/source3/modules/vfs_acl_xattr.c
+++ b/source3/modules/vfs_acl_xattr.c
@@ -278,6 +278,12 @@ static int connect_acl_xattr(struct vfs_handle_struct *handle,
        return 0;
 }
 
+static int acl_xattr_unlink(vfs_handle_struct *handle,
+                        const struct smb_filename *smb_fname)
+{
+       return unlink_acl_common(handle, smb_fname);
+}
+
 static int acl_xattr_unlinkat(vfs_handle_struct *handle,
                         struct files_struct *dirfsp,
                         const struct smb_filename *smb_fname,
@@ -332,7 +338,7 @@ static NTSTATUS acl_xattr_fset_nt_acl(vfs_handle_struct *handle,
 static struct vfs_fn_pointers vfs_acl_xattr_fns = {
        .connect_fn = connect_acl_xattr,
        .rmdir_fn = rmdir_acl_common,
-       .unlink_fn = unlink_acl_common,
+       .unlink_fn = acl_xattr_unlink,
        .unlinkat_fn = acl_xattr_unlinkat,
        .chmod_fn = chmod_acl_module_common,
        .fchmod_fn = fchmod_acl_module_common,