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/smbd/dir.c | |
| 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/smbd/dir.c')
| -rw-r--r-- | source3/smbd/dir.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index 910ab35de8..94b605ee8f 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -715,7 +715,8 @@ static BOOL user_can_read_file(connection_struct *conn, char *name, SMB_STRUCT_S return False; /* Get NT ACL -allocated in main loop talloc context. No free needed here. */ - sd_size = SMB_VFS_FGET_NT_ACL(fsp, fsp->fd, &psd); + sd_size = SMB_VFS_FGET_NT_ACL(fsp, fsp->fd, + (OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION), &psd); close_file(fsp, True); /* No access if SD get failed. */ @@ -768,7 +769,8 @@ static BOOL user_can_write_file(connection_struct *conn, char *name, SMB_STRUCT_ return False; /* Get NT ACL -allocated in main loop talloc context. No free needed here. */ - sd_size = SMB_VFS_FGET_NT_ACL(fsp, fsp->fd, &psd); + sd_size = SMB_VFS_FGET_NT_ACL(fsp, fsp->fd, + (OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION), &psd); close_file(fsp, False); /* No access if SD get failed. */ |