diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-09-20 22:23:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:00:54 -0500 |
| commit | 4db7642caa99c1b054322a8971c4b673556487ce (patch) | |
| tree | 4ca6f040d613bc8127f43cd30a2bc12d3192471b /source3/modules/vfs_afsacl.c | |
| parent | 3ef4b8cf2f4a52c08b71fa8cac1ce4e8409c160b (diff) | |
| download | samba-4db7642caa99c1b054322a8971c4b673556487ce.tar.gz samba-4db7642caa99c1b054322a8971c4b673556487ce.tar.bz2 samba-4db7642caa99c1b054322a8971c4b673556487ce.zip | |
r18745: Use the Samba4 data structures for security descriptors and security descriptor
buffers.
Make security access masks simply a uint32 rather than a structure
with a uint32 in it.
(This used to be commit b41c52b9db5fc4a553b20a7a5a051a4afced9366)
Diffstat (limited to 'source3/modules/vfs_afsacl.c')
| -rw-r--r-- | source3/modules/vfs_afsacl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c index 58d823c4f9..e485b3c526 100644 --- a/source3/modules/vfs_afsacl.c +++ b/source3/modules/vfs_afsacl.c @@ -589,7 +589,7 @@ static uint32 nt_to_afs_file_rights(const char *filename, const SEC_ACE *ace) static size_t afs_to_nt_acl(struct afs_acl *afs_acl, struct files_struct *fsp, uint32 security_info, - struct security_descriptor_info **ppdesc) + struct security_descriptor **ppdesc) { SEC_ACE *nt_ace_list; DOM_SID owner_sid, group_sid; @@ -691,7 +691,7 @@ static BOOL mappable_sid(const DOM_SID *sid) static BOOL nt_to_afs_acl(const char *filename, uint32 security_info_sent, - struct security_descriptor_info *psd, + struct security_descriptor *psd, uint32 (*nt_to_afs_rights)(const char *filename, const SEC_ACE *ace), struct afs_acl *afs_acl) @@ -827,7 +827,7 @@ static BOOL afs_get_afs_acl(char *filename, struct afs_acl *acl) } static size_t afs_get_nt_acl(struct files_struct *fsp, uint32 security_info, - struct security_descriptor_info **ppdesc) + struct security_descriptor **ppdesc) { struct afs_acl acl; size_t sd_size; @@ -881,7 +881,7 @@ static void merge_unknown_aces(struct afs_acl *src, struct afs_acl *dst) static BOOL afs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info_sent, - struct security_descriptor_info *psd) + struct security_descriptor *psd) { struct afs_acl old_afs_acl, new_afs_acl; struct afs_acl dir_acl, file_acl; @@ -982,14 +982,14 @@ static BOOL afs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, static size_t afsacl_fget_nt_acl(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, uint32 security_info, - struct security_descriptor_info **ppdesc) + struct security_descriptor **ppdesc) { return afs_get_nt_acl(fsp, security_info, ppdesc); } static size_t afsacl_get_nt_acl(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, uint32 security_info, - struct security_descriptor_info **ppdesc) + struct security_descriptor **ppdesc) { return afs_get_nt_acl(fsp, security_info, ppdesc); } |