The branch, master has been updated via a5f441d vfs:zfs fix build after get_nt_acl_fn signature change. from ae2083e vfs:glusterfs: fix build after opendir signature change
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit a5f441dc71abfd991baec7e0c1d2961f026e8984 Author: Jeremy Allison <j...@samba.org> Date: Tue Mar 1 21:52:44 2016 -0800 vfs:zfs fix build after get_nt_acl_fn signature change. Signed-off-by: Jeremy Allison <j...@samba.org> Reviewed-by: Uri Simchoni <u...@samba.org> Autobuild-User(master): Uri Simchoni <u...@samba.org> Autobuild-Date(master): Wed Mar 2 10:50:58 CET 2016 on sn-devel-144 ----------------------------------------------------------------------- Summary of changes: source3/modules/vfs_zfsacl.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: 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; } -- Samba Shared Repository