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

Remove the order dependency in parent_override_delete(), just check for & not ==.

This commit is contained in:
Jeremy Allison 2011-10-27 16:48:13 -07:00
parent 80c3aa7d29
commit 3bd6513884

View File

@ -65,7 +65,7 @@ NTSTATUS smb1_file_se_access_check(struct connection_struct *conn,
} }
/**************************************************************************** /****************************************************************************
If the requester wanted DELETE_ACCESS and was only rejected because If the requester wanted DELETE_ACCESS and was rejected because
the file ACL didn't include DELETE_ACCESS, see if the parent ACL the file ACL didn't include DELETE_ACCESS, see if the parent ACL
ovverrides this. ovverrides this.
****************************************************************************/ ****************************************************************************/
@ -76,7 +76,7 @@ static bool parent_override_delete(connection_struct *conn,
uint32_t rejected_mask) uint32_t rejected_mask)
{ {
if ((access_mask & DELETE_ACCESS) && if ((access_mask & DELETE_ACCESS) &&
(rejected_mask == DELETE_ACCESS) && (rejected_mask & DELETE_ACCESS) &&
can_delete_file_in_directory(conn, smb_fname)) { can_delete_file_in_directory(conn, smb_fname)) {
return true; return true;
} }