sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

s4:torture: Fix the test_owner_rights() test to show permissions are additive.

Browse Source 
Tested against Windows.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13812

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
(cherry picked from commit 2e181e34c48c879235c5dc64bd7ab2b59781810c)
This commit is contained in:
Jeremy Allison 2019-02-28 13:55:31 -08:00 committed by Karolin Seeger
parent 8f9858671f
commit b1ce4d436a
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source4/torture/smb2/acls.c
View File

@ -2419,6 +2419,14 @@ static bool test_owner_rights(struct torture_context *tctx,
sd_orig = gi.query_secdesc.out.sd;
owner_sid = dom_sid_string(tctx, sd_orig->owner_sid);
/*
* Add a 2 element ACL
* SEC_RIGHTS_FILE_READ for the owner,
* SEC_FILE_WRITE_DATA for SID_OWNER_RIGHTS.
*
* Proves that the owner and SID_OWNER_RIGHTS
* ACE entries are additive.
*/
sd = security_descriptor_dacl_create(tctx, 0, NULL, NULL,
owner_sid,
SEC_ACE_TYPE_ACCESS_ALLOWED,
@ -2426,7 +2434,7 @@ static bool test_owner_rights(struct torture_context *tctx,
0,
SID_OWNER_RIGHTS,
SEC_ACE_TYPE_ACCESS_ALLOWED,
SEC_RIGHTS_FILE_READ,
SEC_FILE_WRITE_DATA,
0,
NULL);
torture_assert_not_null_goto(tctx, sd, ret, done,
@ -2467,10 +2475,14 @@ static bool test_owner_rights(struct torture_context *tctx,
torture_assert_ntstatus_ok_goto(tctx, mxac_status, ret, done,
"smb2_setinfo_file failed\n");
/* SEC_STD_DELETE comes from the parent directory */
/*
* For some reasons Windows 2016 doesn't set SEC_STD_DELETE but we
* do. Mask it out so the test passes against Samba and Windows.
*/
torture_assert_int_equal_goto(tctx,
cr.out.maximal_access,
SEC_RIGHTS_FILE_READ|SEC_STD_DELETE,
cr.out.maximal_access & ~SEC_STD_DELETE,
SEC_RIGHTS_FILE_READ |
SEC_FILE_WRITE_DATA,
ret, done,
"Wrong maximum access\n");