diff options
| author | Jeremy Allison <jra@samba.org> | 2011-10-27 16:48:13 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-10-28 12:16:42 -0700 |
| commit | 3bd6513884f1f02fe5638a424bcb1948f0921853 (patch) | |
| tree | 084d7268a7a31427733cb6f00a8ed47e7b4baa00 | |
| parent | 80c3aa7d2991302a2280dbfe6df14040347fdc52 (diff) | |
| download | samba-3bd6513884f1f02fe5638a424bcb1948f0921853.tar.gz samba-3bd6513884f1f02fe5638a424bcb1948f0921853.tar.bz2 samba-3bd6513884f1f02fe5638a424bcb1948f0921853.zip | |
Remove the order dependency in parent_override_delete(), just check for & not ==.
| -rw-r--r-- | source3/smbd/open.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 6dab55d100..42edddcaf9 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -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 ovverrides this. ****************************************************************************/ @@ -76,7 +76,7 @@ static bool parent_override_delete(connection_struct *conn, uint32_t rejected_mask) { if ((access_mask & DELETE_ACCESS) && - (rejected_mask == DELETE_ACCESS) && + (rejected_mask & DELETE_ACCESS) && can_delete_file_in_directory(conn, smb_fname)) { return true; } |