diff options
| author | Jeremy Allison <jra@samba.org> | 2003-05-29 23:49:31 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-05-29 23:49:31 +0000 |
| commit | 545e8d499947fec55832352d741e8a904122d564 (patch) | |
| tree | d34f5f33168c1ba3237e0a954f9e199f888060f1 /source3/include | |
| parent | c76ecf6bad492af9822874fde3ff733be366d14a (diff) | |
| download | samba-545e8d499947fec55832352d741e8a904122d564.tar.gz samba-545e8d499947fec55832352d741e8a904122d564.tar.bz2 samba-545e8d499947fec55832352d741e8a904122d564.zip | |
Change get_nt_acl() to include security_info wanted. Only return this.
This gets us closer to W2k+ in what we return for file ACLs. Fix horribly
broken make_sec_desc() that screwed up the size when given a SD with no
owner or group (how did it get this bad... ?).
Jeremy.
(This used to be commit 183c9ed4052ab14e269ed1234ca557053f77e77a)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/vfs.h | 7 | ||||
| -rw-r--r-- | source3/include/vfs_macros.h | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h index f10719144d..92cd065c83 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -47,7 +47,8 @@ /* Changed to version 4 for cascaded VFS interface. Alexander Bokovoy. */ /* Changed to version 5 for sendfile addition. JRA. */ /* Changed to version 6 for the new module system, fixed cascading and quota functions. --metze */ -#define SMB_VFS_INTERFACE_VERSION 6 +/* Version 7 to include the get_nt_acl info parameter. JRA. */ +#define SMB_VFS_INTERFACE_VERSION 7 /* to bug old modules witch are trying to compile with the old functions */ @@ -218,8 +219,8 @@ struct vfs_ops { /* NT ACL operations. */ - size_t (*fget_nt_acl)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, struct security_descriptor_info **ppdesc); - size_t (*get_nt_acl)(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, struct security_descriptor_info **ppdesc); + size_t (*fget_nt_acl)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, uint32 security_info, struct security_descriptor_info **ppdesc); + size_t (*get_nt_acl)(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, uint32 security_info, struct security_descriptor_info **ppdesc); BOOL (*fset_nt_acl)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, uint32 security_info_sent, struct security_descriptor_info *psd); BOOL (*set_nt_acl)(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, uint32 security_info_sent, struct security_descriptor_info *psd); diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index aac8dcdca5..fc25976383 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -70,8 +70,8 @@ #define SMB_VFS_REALPATH(conn, path, resolved_path) ((conn)->vfs.ops.realpath((conn)->vfs.handles.realpath, (conn), (path), (resolved_path))) /* NT ACL operations. */ -#define SMB_VFS_FGET_NT_ACL(fsp, fd, ppdesc) ((fsp)->conn->vfs.ops.fget_nt_acl((fsp)->conn->vfs.handles.fget_nt_acl, (fsp), (fd), (ppdesc))) -#define SMB_VFS_GET_NT_ACL(fsp, name, ppdesc) ((fsp)->conn->vfs.ops.get_nt_acl((fsp)->conn->vfs.handles.get_nt_acl, (fsp), (name), (ppdesc))) +#define SMB_VFS_FGET_NT_ACL(fsp, fd, security_info, ppdesc) ((fsp)->conn->vfs.ops.fget_nt_acl((fsp)->conn->vfs.handles.fget_nt_acl, (fsp), (fd), (security_info), (ppdesc))) +#define SMB_VFS_GET_NT_ACL(fsp, name, security_info, ppdesc) ((fsp)->conn->vfs.ops.get_nt_acl((fsp)->conn->vfs.handles.get_nt_acl, (fsp), (name), (security_info), (ppdesc))) #define SMB_VFS_FSET_NT_ACL(fsp, fd, security_info_sent, psd) ((fsp)->conn->vfs.ops.fset_nt_acl((fsp)->conn->vfs.handles.fset_nt_acl, (fsp), (fd), (security_info_sent), (psd))) #define SMB_VFS_SET_NT_ACL(fsp, name, security_info_sent, psd) ((fsp)->conn->vfs.ops.set_nt_acl((fsp)->conn->vfs.handles.set_nt_acl, (fsp), (name), (security_info_sent), (psd))) |