sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

vfs:zfs fix build after get_nt_acl_fn signature change.

Browse Source 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>

Autobuild-User(master): Uri Simchoni <uri@samba.org>
Autobuild-Date(master): Wed Mar  2 10:50:58 CET 2016 on sn-devel-144
This commit is contained in:
Jeremy Allison 2016-03-01 21:52:44 -08:00 committed by Uri Simchoni
parent ae2083e1cc
commit a5f441dc71
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source3/modules/vfs_zfsacl.c
View File

@ -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;
}