sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00
Code

nfs4acls: Add "smbacl4_vfs_params" parameter to smb_fget_nt_acl_nfs4

Browse Source 
Pure placeholder right now, this will allow vfs modules to load the params
in advance. nfs4 acl parameters should not change while a tcon is live,
and lp_parm_get_* show up in profiles. Loading the parameters once at
tcon time will remove this.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Volker Lendecke 2016-08-09 11:07:38 +02:00 committed by Ralph Boehme
parent 41bb898d0a
commit fbddf56f17
6 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source3/modules/nfs4_acls.c
View File

@ -533,6 +533,7 @@ static NTSTATUS smb_get_nt_acl_nfs4_common(const SMB_STRUCT_STAT *sbuf,
} }
NTSTATUS smb_fget_nt_acl_nfs4(files_struct *fsp, NTSTATUS smb_fget_nt_acl_nfs4(files_struct *fsp,
const struct smbacl4_vfs_params *pparams,
uint32_t security_info, uint32_t security_info,
TALLOC_CTX *mem_ctx, TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc, struct security_descriptor **ppdesc,

2
source3/modules/nfs4_acls.h
View File

@ -109,6 +109,7 @@ typedef struct _SMB_ACE4PROP_T {
struct SMB4ACL_T; struct SMB4ACL_T;
struct SMB4ACE_T; struct SMB4ACE_T;
struct smbacl4_vfs_params;
struct SMB4ACL_T *smb_create_smb4acl(TALLOC_CTX *mem_ctx); struct SMB4ACL_T *smb_create_smb4acl(TALLOC_CTX *mem_ctx);
@ -131,6 +132,7 @@ uint16_t smbacl4_get_controlflags(struct SMB4ACL_T *theacl);
bool smbacl4_set_controlflags(struct SMB4ACL_T *theacl, uint16_t controlflags); bool smbacl4_set_controlflags(struct SMB4ACL_T *theacl, uint16_t controlflags);
NTSTATUS smb_fget_nt_acl_nfs4(files_struct *fsp, NTSTATUS smb_fget_nt_acl_nfs4(files_struct *fsp,
const struct smbacl4_vfs_params *pparams,
uint32_t security_info, uint32_t security_info,
TALLOC_CTX *mem_ctx, TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc, struct SMB4ACL_T *theacl); struct security_descriptor **ppdesc, struct SMB4ACL_T *theacl);

2
source3/modules/vfs_aixacl2.c
View File

@ -179,7 +179,7 @@ static NTSTATUS aixjfs2_fget_nt_acl(vfs_handle_struct *handle,
return NT_STATUS_ACCESS_DENIED; return NT_STATUS_ACCESS_DENIED;
} }
status = smb_fget_nt_acl_nfs4(fsp, security_info, ppdesc, status = smb_fget_nt_acl_nfs4(fsp, NULL, security_info, ppdesc,
mem_ctx, pacl); mem_ctx, pacl);
TALLOC_FREE(frame); TALLOC_FREE(frame);
return status; return status;

4
source3/modules/vfs_gpfs.c
View File

@ -589,8 +589,8 @@ static NTSTATUS gpfsacl_fget_nt_acl(vfs_handle_struct *handle,
result = gpfs_get_nfs4_acl(frame, fsp->fsp_name->base_name, &pacl); result = gpfs_get_nfs4_acl(frame, fsp->fsp_name->base_name, &pacl);
if (result == 0) { if (result == 0) {
status = smb_fget_nt_acl_nfs4(fsp, security_info, mem_ctx, status = smb_fget_nt_acl_nfs4(fsp, NULL, security_info,
ppdesc, pacl); mem_ctx, ppdesc, pacl);
TALLOC_FREE(frame); TALLOC_FREE(frame);
return status; return status;
} }

3
source3/modules/vfs_nfs4acl_xattr.c
View File

@ -535,7 +535,8 @@ static NTSTATUS nfs4acl_xattr_fget_nt_acl(struct vfs_handle_struct *handle,
return status; return status;
} }
status = smb_fget_nt_acl_nfs4(fsp, security_info, mem_ctx, ppdesc, pacl); status = smb_fget_nt_acl_nfs4(fsp, NULL, security_info, mem_ctx,
ppdesc, pacl);
TALLOC_FREE(frame); TALLOC_FREE(frame);
return status; return status;
} }

3
source3/modules/vfs_zfsacl.c
View File

@ -209,7 +209,8 @@ static NTSTATUS zfsacl_fget_nt_acl(struct vfs_handle_struct *handle,
return status; return status;
} }
status = smb_fget_nt_acl_nfs4(fsp, security_info, mem_ctx, ppdesc, pacl); status = smb_fget_nt_acl_nfs4(fsp, NULL, security_info, mem_ctx,
ppdesc, pacl);
TALLOC_FREE(frame); TALLOC_FREE(frame);
return status; return status;
} }