>From 24f5f34a2c1f6b0119b5cfb66e296ebf23f5b7ec Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 1 Mar 2016 21:52:44 -0800 Subject: [PATCH] vfs:zfs fix build after get_nt_acl_fn signature change. Signed-off-by: Jeremy Allison --- source3/modules/vfs_zfsacl.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c index 02cbcdf..7dc7cec 100644 --- a/source3/modules/vfs_zfsacl.c +++ b/source3/modules/vfs_zfsacl.c @@ -215,23 +215,29 @@ static NTSTATUS zfsacl_fget_nt_acl(struct vfs_handle_struct *handle, } static NTSTATUS zfsacl_get_nt_acl(struct vfs_handle_struct *handle, - const char *name, uint32_t security_info, - TALLOC_CTX *mem_ctx, - struct security_descriptor **ppdesc) + const struct smb_filename *smb_fname, + uint32_t security_info, + TALLOC_CTX *mem_ctx, + struct security_descriptor **ppdesc) { struct SMB4ACL_T *pacl; NTSTATUS status; TALLOC_CTX *frame = talloc_stackframe(); - status = zfs_get_nt_acl_common(frame, name, &pacl); + status = zfs_get_nt_acl_common(frame, + smb_fname->base_name, + &pacl); if (!NT_STATUS_IS_OK(status)) { TALLOC_FREE(frame); return status; } - status = smb_get_nt_acl_nfs4(handle->conn, name, security_info, - mem_ctx, ppdesc, - pacl); + status = smb_get_nt_acl_nfs4(handle->conn, + smb_fname->base_name, + security_info, + mem_ctx, + ppdesc, + pacl); TALLOC_FREE(frame); return status; } -- 1.9.1