sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

smbd: get_acl_group_bits() needs a fsp, not a name

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Volker Lendecke 2022-03-10 19:30:28 +01:00 committed by Ralph Boehme
parent 8cee31c687
commit 0e4cc565e6
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/smbd/dosmode.c
View File

@ -939,8 +939,8 @@ int file_set_dosmode(connection_struct *conn,
unixmode = smb_fname->st.st_ex_mode;
if (smb_fname->fsp != NULL) {
get_acl_group_bits(conn, smb_fname,
&smb_fname->st.st_ex_mode);
get_acl_group_bits(
conn, smb_fname->fsp, &smb_fname->st.st_ex_mode);
}
if (S_ISDIR(smb_fname->st.st_ex_mode))

8
source3/smbd/posix_acls.c
View File

@ -3835,16 +3835,16 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32_t security_info_sent, const struct
the mask bits, not the real group bits, for a file with an ACL.
****************************************************************************/
int get_acl_group_bits( connection_struct *conn,
const struct smb_filename *smb_fname,
mode_t *mode )
int get_acl_group_bits(connection_struct *conn,
struct files_struct *fsp,
mode_t *mode )
{
int entry_id = SMB_ACL_FIRST_ENTRY;
SMB_ACL_ENTRY_T entry;
SMB_ACL_T posix_acl;
int result = -1;
posix_acl = SMB_VFS_SYS_ACL_GET_FD(smb_fname->fsp,
posix_acl = SMB_VFS_SYS_ACL_GET_FD(fsp,
SMB_ACL_TYPE_ACCESS,
talloc_tos());
if (posix_acl == (SMB_ACL_T)NULL)

6
source3/smbd/proto.h
View File

@ -856,9 +856,9 @@ NTSTATUS posix_fget_nt_acl(struct files_struct *fsp, uint32_t security_info,
struct security_descriptor **ppdesc);
NTSTATUS try_chown(files_struct *fsp, uid_t uid, gid_t gid);
NTSTATUS set_nt_acl(files_struct *fsp, uint32_t security_info_sent, const struct security_descriptor *psd);
int get_acl_group_bits( connection_struct *conn,
const struct smb_filename *smb_fname,
mode_t *mode);
int get_acl_group_bits(connection_struct *conn,
struct files_struct *fsp,
mode_t *mode);
int inherit_access_posix_acl(connection_struct *conn,
struct files_struct *inherit_from_dirfsp,
const struct smb_filename *smb_fname,