diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-04-14 17:31:42 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2013-05-09 06:18:20 +0200 |
| commit | 67bb7d93ba8fccd030bd8d01536f3222c85134b7 (patch) | |
| tree | 3beaf4e99250cece90e8190eb60e0fde757b0ba9 /source3/modules/vfs_aixacl2.c | |
| parent | d87b81fa303ee297685f4eb5599010901ed68145 (diff) | |
| download | samba-67bb7d93ba8fccd030bd8d01536f3222c85134b7.tar.gz samba-67bb7d93ba8fccd030bd8d01536f3222c85134b7.tar.bz2 samba-67bb7d93ba8fccd030bd8d01536f3222c85134b7.zip | |
vfs: Add vfs_handle_struct argument to smb_set_nt_acl_nfs4 and the callback
This allows the callback to call xattr based storage functions that need this argument.
Andrew Bartlett
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/modules/vfs_aixacl2.c')
| -rw-r--r-- | source3/modules/vfs_aixacl2.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c index 65625d1853..aca7a652d6 100644 --- a/source3/modules/vfs_aixacl2.c +++ b/source3/modules/vfs_aixacl2.c @@ -338,7 +338,7 @@ static int aixjfs2_query_acl_support( return 1; /* haven't found that ACL type. */ } -static bool aixjfs2_process_smbacl(files_struct *fsp, SMB4ACL_T *smbacl) +static bool aixjfs2_process_smbacl(vfs_handle_struct *handle, files_struct *fsp, SMB4ACL_T *smbacl) { SMB4ACE_T *smbace; TALLOC_CTX *mem_ctx; @@ -413,20 +413,21 @@ static bool aixjfs2_process_smbacl(files_struct *fsp, SMB4ACL_T *smbacl) return True; } -static NTSTATUS aixjfs2_set_nt_acl_common(files_struct *fsp, uint32 security_info_sent, const struct security_descriptor *psd) +static NTSTATUS aixjfs2_set_nt_acl_common(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info_sent, const struct security_descriptor *psd) { acl_type_t acl_type_info; NTSTATUS result = NT_STATUS_ACCESS_DENIED; int rc; rc = aixjfs2_query_acl_support( + handle, fsp->fsp_name, ACL_NFS4, &acl_type_info); if (rc==0) { - result = smb_set_nt_acl_nfs4( + result = smb_set_nt_acl_nfs4(handle, fsp, security_info_sent, psd, aixjfs2_process_smbacl); } else if (rc==1) { /* assume POSIX ACL - by default... */ @@ -439,7 +440,7 @@ static NTSTATUS aixjfs2_set_nt_acl_common(files_struct *fsp, uint32 security_inf NTSTATUS aixjfs2_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info_sent, const struct security_descriptor *psd) { - return aixjfs2_set_nt_acl_common(fsp, security_info_sent, psd); + return aixjfs2_set_nt_acl_common(handle, fsp, security_info_sent, psd); } int aixjfs2_sys_acl_set_file(vfs_handle_struct *handle, |