sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-24 02:04:21 +03:00
Code

vfs_zfsacl: pass config to zfs_get_nt_acl_common()

Browse Source 
Not used for now, that comes next.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andrew Walker <awalker@ixsystems.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2019-10-19 15:37:45 +02:00 committed by Jeremy Allison
parent cd313d0ade
commit 063fadd322
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source3/modules/vfs_zfsacl.c
View File

@ -48,7 +48,8 @@ struct zfsacl_config_data {
static NTSTATUS zfs_get_nt_acl_common(struct connection_struct *conn,
TALLOC_CTX *mem_ctx,
const struct smb_filename *smb_fname,
struct SMB4ACL_T **ppacl)
struct SMB4ACL_T **ppacl,
struct zfsacl_config_data *config)
{
int naces, i;
ace_t *acebuf;
@ -250,10 +251,16 @@ static NTSTATUS zfsacl_fget_nt_acl(struct vfs_handle_struct *handle,
{
struct SMB4ACL_T *pacl;
NTSTATUS status;
struct zfsacl_config_data *config = NULL;
SMB_VFS_HANDLE_GET_DATA(handle, config,
struct zfsacl_config_data,
return NT_STATUS_INTERNAL_ERROR);
TALLOC_CTX *frame = talloc_stackframe();
status = zfs_get_nt_acl_common(handle->conn, frame,
fsp->fsp_name, &pacl);
fsp->fsp_name, &pacl, config);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(frame);
if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
@ -286,9 +293,14 @@ static NTSTATUS zfsacl_get_nt_acl(struct vfs_handle_struct *handle,
{
struct SMB4ACL_T *pacl;
NTSTATUS status;
struct zfsacl_config_data *config = NULL;
SMB_VFS_HANDLE_GET_DATA(handle, config,
struct zfsacl_config_data,
return NT_STATUS_INTERNAL_ERROR);
TALLOC_CTX *frame = talloc_stackframe();
status = zfs_get_nt_acl_common(handle->conn, frame, smb_fname, &pacl);
status = zfs_get_nt_acl_common(handle->conn, frame, smb_fname, &pacl, config);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(frame);
if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {