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

Change the S3 fileserver over to se_file_access_check().

Browse Source 
Don't set the priv_open_requested yet until the open-for-backup
request is correctly passed in.
This commit is contained in:
Jeremy Allison 2012-08-27 16:07:32 -07:00
parent 2b89e1a20a
commit 46455642a7
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/lib/sharesec.c
View File

@ -451,7 +451,7 @@ bool share_access_check(const struct security_token *token,
return false;
}
status = se_access_check(psd, token, desired_access, &granted);
status = se_file_access_check(psd, token, true, desired_access, &granted);
TALLOC_FREE(psd);

15
source3/smbd/open.c
View File

@ -129,11 +129,12 @@ NTSTATUS smbd_check_access_rights(struct connection_struct *conn,
}
/*
* Never test FILE_READ_ATTRIBUTES. se_access_check() also takes care of
* Never test FILE_READ_ATTRIBUTES. se_file_access_check() also takes care of
* owner WRITE_DAC and READ_CONTROL.
*/
status = se_access_check(sd,
status = se_file_access_check(sd,
get_current_nttok(conn),
false,
(access_mask & ~FILE_READ_ATTRIBUTES),
&rejected_mask);
@ -245,11 +246,12 @@ static NTSTATUS check_parent_access(struct connection_struct *conn,
}
/*
* Never test FILE_READ_ATTRIBUTES. se_access_check() also takes care of
* Never test FILE_READ_ATTRIBUTES. se_file_access_check() also takes care of
* owner WRITE_DAC and READ_CONTROL.
*/
status = se_access_check(parent_sd,
status = se_file_access_check(parent_sd,
get_current_nttok(conn),
false,
(access_mask & ~FILE_READ_ATTRIBUTES),
&access_granted);
if(!NT_STATUS_IS_OK(status)) {
@ -1681,11 +1683,12 @@ static NTSTATUS smbd_calculate_maximum_allowed_access(
}
/*
* Never test FILE_READ_ATTRIBUTES. se_access_check()
* Never test FILE_READ_ATTRIBUTES. se_file_access_check()
* also takes care of owner WRITE_DAC and READ_CONTROL.
*/
status = se_access_check(sd,
status = se_file_access_check(sd,
get_current_nttok(conn),
false,
(*p_access_mask & ~FILE_READ_ATTRIBUTES),
&access_granted);