s3: VFS: Change SMB_VFS_SYS_ACL_DELETE_DEF_FILE to use const struct smb_filename...

[sfrench/samba-autobuild/.git] / source3 / modules / vfs_zfsacl.c

diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c
index 0077553c9dccd01acdfeee2805e4f38b86ad4938..c59a910626046803e5f977e8e9edd0b1f9ad9cc3 100644 (file)
--- a/source3/modules/vfs_zfsacl.c
+++ b/source3/modules/vfs_zfsacl.c
@@ -187,7 +187,7 @@ static NTSTATUS zfs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
                           uint32_t security_info_sent,
                           const struct security_descriptor *psd)
 {
-        return smb_set_nt_acl_nfs4(handle, fsp, security_info_sent, psd,
+        return smb_set_nt_acl_nfs4(handle, fsp, NULL, security_info_sent, psd,
                                   zfs_process_smbacl);
 }
 
@@ -235,6 +235,7 @@ static NTSTATUS zfsacl_get_nt_acl(struct vfs_handle_struct *handle,
 
        status = smb_get_nt_acl_nfs4(handle->conn,
                                        smb_fname,
+                                       NULL,
                                        security_info,
                                        mem_ctx,
                                        ppdesc,
@@ -313,7 +314,7 @@ static int zfsacl_fail__sys_acl_set_fd(vfs_handle_struct *handle,
 }
 
 static int zfsacl_fail__sys_acl_delete_def_file(vfs_handle_struct *handle,
-                                               const char *path)
+                       const struct smb_filename *smb_fname)
 {
        return -1;
 }
@@ -343,8 +344,8 @@ static struct vfs_fn_pointers zfsacl_fns = {
        .fset_nt_acl_fn = zfsacl_fset_nt_acl,
 };
 
-NTSTATUS vfs_zfsacl_init(void);
-NTSTATUS vfs_zfsacl_init(void)
+NTSTATUS vfs_zfsacl_init(TALLOC_CTX *);
+NTSTATUS vfs_zfsacl_init(TALLOC_CTX *ctx)
 {
        return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "zfsacl",
                                &zfsacl_fns);