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/include/vfs.h | |
| 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/include/vfs.h')
| -rw-r--r-- | source/include/vfs.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/include/vfs.h b/source/include/vfs.h index eac9eced165..d968ba9d82a 100644 --- a/source/include/vfs.h +++ b/source/include/vfs.h @@ -71,6 +71,7 @@ * timestamp resolition. JRA. */ /* Changed to version21 to add chflags operation -- jpeach */ /* Changed to version22 to add lchown operation -- jra */ +/* Leave at 22 - not yet released. But change set_nt_acl to return an NTSTATUS. jra. */ #define SMB_VFS_INTERFACE_VERSION 22 @@ -300,8 +301,8 @@ struct vfs_ops { size_t (*fget_nt_acl)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, uint32 security_info, struct security_descriptor **ppdesc); size_t (*get_nt_acl)(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, uint32 security_info, struct security_descriptor **ppdesc); - BOOL (*fset_nt_acl)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, uint32 security_info_sent, struct security_descriptor *psd); - BOOL (*set_nt_acl)(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, uint32 security_info_sent, struct security_descriptor *psd); + NTSTATUS (*fset_nt_acl)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, uint32 security_info_sent, struct security_descriptor *psd); + NTSTATUS (*set_nt_acl)(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, uint32 security_info_sent, struct security_descriptor *psd); /* POSIX ACL operations. */ |