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: copy_access_posix_acl() just needs fsps these days

Browse Source 
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:37:37 +01:00 committed by Jeremy Allison
parent a1d5ae30ed
commit 1d6762d86b
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source3/smbd/posix_acls.c
View File

@ -3953,26 +3953,25 @@ static int chmod_acl_internals(SMB_ACL_T posix_acl, mode_t mode)
resulting ACL on TO. Note that name is in UNIX character set.
****************************************************************************/
static int copy_access_posix_acl(connection_struct *conn,
const struct smb_filename *smb_fname_from,
const struct smb_filename *smb_fname_to,
mode_t mode)
static int copy_access_posix_acl(struct files_struct *from,
struct files_struct *to,
mode_t mode)
{
SMB_ACL_T posix_acl = NULL;
int ret = -1;
if ((posix_acl = SMB_VFS_SYS_ACL_GET_FD(smb_fname_from->fsp,
SMB_ACL_TYPE_ACCESS,
talloc_tos())) == NULL)
posix_acl = SMB_VFS_SYS_ACL_GET_FD(
from, SMB_ACL_TYPE_ACCESS, talloc_tos());
if (from == NULL) {
return -1;
}
ret = chmod_acl_internals(posix_acl, mode);
if (ret == -1) {
goto done;
}
ret = SMB_VFS_SYS_ACL_SET_FD(smb_fname_to->fsp,
SMB_ACL_TYPE_ACCESS, posix_acl);
ret = SMB_VFS_SYS_ACL_SET_FD(to, SMB_ACL_TYPE_ACCESS, posix_acl);
done:
@ -4011,10 +4010,14 @@ int inherit_access_posix_acl(connection_struct *conn,
const struct smb_filename *smb_fname,
mode_t mode)
{
int ret;
if (directory_has_default_posix_acl(inherit_from_dir->fsp))
return 0;
return copy_access_posix_acl(conn, inherit_from_dir, smb_fname, mode);
ret = copy_access_posix_acl(
inherit_from_dir->fsp, smb_fname->fsp, mode);
return ret;
}
/****************************************************************************