sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s3: smbd: Make set_unix_posix_default_acl() take an fsp argument, not smb_fname.

Browse Source 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
This commit is contained in:
Jeremy Allison 2019-06-18 15:36:58 -07:00
parent 77454ecfbd
commit 147ce70eea
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source3/smbd/posix_acls.c
View File

@ -4351,7 +4351,7 @@ static SMB_ACL_T create_posix_acl_from_wire(connection_struct *conn,
****************************************************************************/
NTSTATUS set_unix_posix_default_acl(connection_struct *conn,
const struct smb_filename *smb_fname,
files_struct *fsp,
uint16_t num_def_acls,
const char *pdata)
{
@ -4359,24 +4359,18 @@ NTSTATUS set_unix_posix_default_acl(connection_struct *conn,
NTSTATUS status;
int ret;
if (!S_ISDIR(smb_fname->st.st_ex_mode)) {
if (num_def_acls) {
DBG_INFO("Can't set default ACL on non-directory "
"file %s\n",
smb_fname->base_name);
return map_nt_error_from_unix(EISDIR);
}
return NT_STATUS_OK;
if (!fsp->is_directory) {
return NT_STATUS_INVALID_HANDLE;
}
if (!num_def_acls) {
/* Remove the default ACL. */
ret = SMB_VFS_SYS_ACL_DELETE_DEF_FILE(conn, smb_fname);
ret = SMB_VFS_SYS_ACL_DELETE_DEF_FILE(conn, fsp->fsp_name);
if (ret == -1) {
status = map_nt_error_from_unix(errno);
DBG_INFO("acl_delete_def_file failed on "
"directory %s (%s)\n",
smb_fname->base_name,
fsp_str_dbg(fsp),
strerror(errno));
return status;
}
@ -4392,20 +4386,20 @@ NTSTATUS set_unix_posix_default_acl(connection_struct *conn,
}
ret = SMB_VFS_SYS_ACL_SET_FILE(conn,
smb_fname,
fsp->fsp_name,
SMB_ACL_TYPE_DEFAULT,
def_acl);
if (ret == -1) {
status = map_nt_error_from_unix(errno);
DBG_INFO("acl_set_file failed on directory %s (%s)\n",
smb_fname->base_name,
fsp_str_dbg(fsp),
strerror(errno));
TALLOC_FREE(def_acl);
return status;
}
DBG_DEBUG("set default acl for file %s\n",
smb_fname->base_name);
fsp_str_dbg(fsp));
TALLOC_FREE(def_acl);
return NT_STATUS_OK;
}

2
source3/smbd/proto.h
View File

@ -808,7 +808,7 @@ int inherit_access_posix_acl(connection_struct *conn,
const struct smb_filename *smb_fname,
mode_t mode);
NTSTATUS set_unix_posix_default_acl(connection_struct *conn,
const struct smb_filename *smb_fname,
files_struct *fsp,
uint16_t num_def_acls, const char *pdata);
NTSTATUS set_unix_posix_acl(connection_struct *conn, files_struct *fsp,
uint16_t num_acls,

2
source3/smbd/trans2.c
View File

@ -7484,7 +7484,7 @@ static NTSTATUS smb_set_posix_acl(connection_struct *conn,
if (valid_def_acls) {
status = set_unix_posix_default_acl(conn,
fsp->fsp_name,
fsp,
num_def_acls,
pdata);
if (!NT_STATUS_IS_OK(status)) {