sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-24 10:50:22 +03:00
Code

smbd: Make directory_has_default_posix_acl() just take "dirfsp"

Browse Source 
conn is not referenced anymore, and we only need the files_struct

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2022-01-24 17:32:08 +01:00 committed by Jeremy Allison
parent 191c15f5ef
commit ea8a653754
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/smbd/posix_acls.c
View File

@ -3982,12 +3982,10 @@ static int copy_access_posix_acl(connection_struct *conn,
Check for an existing default POSIX ACL on a directory.
****************************************************************************/
static bool directory_has_default_posix_acl(connection_struct *conn,
const struct smb_filename *smb_fname)
static bool directory_has_default_posix_acl(struct files_struct *dirfsp)
{
SMB_ACL_T def_acl = SMB_VFS_SYS_ACL_GET_FD(smb_fname->fsp,
SMB_ACL_TYPE_DEFAULT,
talloc_tos());
SMB_ACL_T def_acl = SMB_VFS_SYS_ACL_GET_FD(
dirfsp, SMB_ACL_TYPE_DEFAULT, talloc_tos());
bool has_acl = False;
SMB_ACL_ENTRY_T entry;
@ -4011,7 +4009,7 @@ int inherit_access_posix_acl(connection_struct *conn,
const struct smb_filename *smb_fname,
mode_t mode)
{
if (directory_has_default_posix_acl(conn, inherit_from_dir))
if (directory_has_default_posix_acl(inherit_from_dir->fsp))
return 0;
return copy_access_posix_acl(conn, inherit_from_dir, smb_fname, mode);