diff options
| author | Jeremy Allison <jra@samba.org> | 2007-06-26 22:49:10 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:23:37 -0500 |
| commit | fc6899a5506b272f8cd5f5837ca13300b4e69a5f (patch) | |
| tree | 01ae06c1ff3c71112749b7903c428ef5c886d30b /source/modules/vfs_zfsacl.c | |
| parent | 05520d6b0a86c1cd5abbf6252c4a32629cdf8619 (diff) | |
| download | samba-fc6899a5506b272f8cd5f5837ca13300b4e69a5f.tar.gz samba-fc6899a5506b272f8cd5f5837ca13300b4e69a5f.tar.xz samba-fc6899a5506b272f8cd5f5837ca13300b4e69a5f.zip | |
r23620: Convert set_nt_acl to return NTSTATUS. Also fix the chown
return to correctly return NT_STATUS_INVALID_OWNER if it
should be disallowed. Matches better what W2K3R3 does.
NFSv4 ACL module owners, please examine these changes.
Jeremy.
Diffstat (limited to 'source/modules/vfs_zfsacl.c')
| -rw-r--r-- | source/modules/vfs_zfsacl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/modules/vfs_zfsacl.c b/source/modules/vfs_zfsacl.c index 79602c22211..a68258cfdb9 100644 --- a/source/modules/vfs_zfsacl.c +++ b/source/modules/vfs_zfsacl.c @@ -125,7 +125,7 @@ static BOOL zfs_process_smbacl(files_struct *fsp, SMB4ACL_T *smbacl) * set the local file's acls obtaining it in NT form * using the NFSv4 format conversion */ -static BOOL zfs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, +static NTSTATUS zfs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info_sent, struct security_descriptor *psd) { @@ -149,7 +149,7 @@ static size_t zfsacl_get_nt_acl(struct vfs_handle_struct *handle, return zfs_get_nt_acl(fsp, security_info, ppdesc); } -static BOOL zfsacl_fset_nt_acl(vfs_handle_struct *handle, +static NTSTATUS zfsacl_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, int fd, uint32 security_info_sent, SEC_DESC *psd) @@ -157,7 +157,7 @@ static BOOL zfsacl_fset_nt_acl(vfs_handle_struct *handle, return zfs_set_nt_acl(handle, fsp, security_info_sent, psd); } -static BOOL zfsacl_set_nt_acl(vfs_handle_struct *handle, +static NTSTATUS zfsacl_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, const char *name, uint32 security_info_sent, SEC_DESC *psd) |