sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

smbd: pass struct smb_filename to directory_has_default_acl()

Browse Source 
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2020-04-28 18:03:41 +02:00 committed by Jeremy Allison
parent aa0ec8a209
commit d9ae1c78b9
5 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/modules/vfs_ceph.c
View File

@ -365,9 +365,7 @@ static int cephwrap_mkdirat(struct vfs_handle_struct *handle,
if (lp_inherit_acls(SNUM(handle->conn))) {
ok = parent_smb_fname(talloc_tos(), smb_fname, &parent, NULL);
if (ok && directory_has_default_acl(handle->conn,
parent->base_name))
{
if (ok && directory_has_default_acl(handle->conn, parent)) {
mode = 0777;
}
}

4
source3/modules/vfs_default.c
View File

@ -637,9 +637,7 @@ static int vfswrap_mkdirat(vfs_handle_struct *handle,
if (lp_inherit_acls(SNUM(handle->conn))) {
ok = parent_smb_fname(talloc_tos(), smb_fname, &parent, NULL);
if (ok && directory_has_default_acl(handle->conn,
parent->base_name))
{
if (ok && directory_has_default_acl(handle->conn, parent)) {
mode = (0777 & lp_directory_mask(SNUM(handle->conn)));
}
}

12
source3/smbd/file_access.c
View File

@ -140,20 +140,12 @@ bool can_write_to_file(connection_struct *conn,
Check for an existing default Windows ACL on a directory.
****************************************************************************/
bool directory_has_default_acl(connection_struct *conn, const char *fname)
bool directory_has_default_acl(connection_struct *conn,
struct smb_filename *smb_fname)
{
struct security_descriptor *secdesc = NULL;
unsigned int i;
NTSTATUS status;
struct smb_filename *smb_fname = synthetic_smb_fname(talloc_tos(),
fname,
NULL,
NULL,
0);
if (smb_fname == NULL) {
return false;
}
status = SMB_VFS_GET_NT_ACL(conn, smb_fname,
SECINFO_DACL, talloc_tos(),

2
source3/smbd/open.c
View File

@ -3615,7 +3615,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
*/
if ((flags2 & O_CREAT) && lp_inherit_acls(SNUM(conn)) &&
(def_acl = directory_has_default_acl(conn, parent_dir))) {
(def_acl = directory_has_default_acl(conn, parent_dir_fname))) {
unx_mode = (0777 & lp_create_mask(SNUM(conn)));
}

3
source3/smbd/proto.h
View File

@ -326,7 +326,8 @@ bool can_delete_file_in_directory(connection_struct *conn,
const struct smb_filename *smb_fname);
bool can_write_to_file(connection_struct *conn,
const struct smb_filename *smb_fname);
bool directory_has_default_acl(connection_struct *conn, const char *fname);
bool directory_has_default_acl(connection_struct *conn,
struct smb_filename *smb_fname);
NTSTATUS can_set_delete_on_close(files_struct *fsp, uint32_t dosmode);
/* The following definitions come from smbd/fileio.c */