From cda9371b59c2692a27aa1bbc848583f44bd58322 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Fri, 10 Nov 2023 11:35:42 +1300 Subject: [PATCH] libcli/security/test_sddl_conditional_ace: adjust RA octet parse tests We are going to parse octet strings like Windows (as opposed to like Windows docs), so the tests need changing. Signed-off-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- libcli/security/tests/test_run_conditional_ace.c | 2 +- libcli/security/tests/test_sddl_conditional_ace.c | 8 ++++---- selftest/knownfail.d/ra-escapes | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 selftest/knownfail.d/ra-escapes diff --git a/libcli/security/tests/test_run_conditional_ace.c b/libcli/security/tests/test_run_conditional_ace.c index 433f830afed..ebc3524fa4b 100644 --- a/libcli/security/tests/test_run_conditional_ace.c +++ b/libcli/security/tests/test_run_conditional_ace.c @@ -613,7 +613,7 @@ static void test_user_attr_any_of_missing_user_attr(void **state) INIT(); USER_SIDS("WD", "AA"); SD("D:(XD;;FX;;;S-1-1-0;(@User.Project Any_of @Resource.Project))" - "S:(RA;;;;;WD;(\"Project\",TX,0,#1234))"); + "S:(RA;;;;;WD;(\"Project\",TX,0,1234))"); DENY_CHECK(0x10); } diff --git a/libcli/security/tests/test_sddl_conditional_ace.c b/libcli/security/tests/test_sddl_conditional_ace.c index 2b084c80281..4aaf4f21d19 100644 --- a/libcli/security/tests/test_sddl_conditional_ace.c +++ b/libcli/security/tests/test_sddl_conditional_ace.c @@ -484,10 +484,10 @@ static void test_full_sddl_ra_escapes(void **state) "%0016%0016%0016%0016%0016%0016%0016%0016%0016%0016%0016" "%0016%0016%0016%0016%0016%0016r\"," "TX,0x0," - "#0077,#00,#0077,#00,#0077,#00,#00,#00,#0077,#00,#0077," - "#00,#0077,#007777,#007777,#0077,#007777,#0077,#007777," - "#007770,#0077,#00,#0077,#00,#00,#00,#0077,#00,#0077,#00," - "#0077,#007777,#007777,#0077,#007777,#0077,#007777,#007777))"); + "0077,00,0077,00,0077,00,00,00,0077,00,0077," + "00,0077,007777,007777,0077,007777,0077,007777," + "007770,0077,00,0077,00,00,00,0077,00,0077,00," + "0077,007777,007777,0077,007777,0077,007777,007777))"); uint8_t win_bytes[] = { 0x01, 0x00, 0x14, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x00, 0x00, diff --git a/selftest/knownfail.d/ra-escapes b/selftest/knownfail.d/ra-escapes new file mode 100644 index 00000000000..ed5671b1bcc --- /dev/null +++ b/selftest/knownfail.d/ra-escapes @@ -0,0 +1,2 @@ +samba.unittests.sddl_conditional_ace.test_full_sddl_ra_escapes +samba.unittests.run_conditional_ace.test_user_attr_any_of_missing_user_attr -- 2.47.3