From: Douglas Bagnall Date: Tue, 19 Sep 2023 22:30:23 +0000 (+1200) Subject: libcli/security: adjust tests for evaluate_claims flag X-Git-Tag: tevent-0.16.0~420 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=588a339df7c178741ffdc0e5ecffc0e21c8118ba;p=thirdparty%2Fsamba.git libcli/security: adjust tests for evaluate_claims flag Most tests were prepared in advance, but we left these ones to test the change. Signed-off-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- diff --git a/libcli/security/tests/test_run_conditional_ace.c b/libcli/security/tests/test_run_conditional_ace.c index 38b8ed8fee9..cce117934f9 100644 --- a/libcli/security/tests/test_run_conditional_ace.c +++ b/libcli/security/tests/test_run_conditional_ace.c @@ -129,7 +129,9 @@ static bool fill_token_sids(TALLOC_CTX *mem_ctx, static void test_device_claims_composite(void **state) { TALLOC_CTX *mem_ctx = talloc_new(NULL); - struct security_token token = {}; + struct security_token token = { + .evaluate_claims = CLAIMS_EVALUATION_ALWAYS + }; bool ok; NTSTATUS status; uint32_t access_granted = 0; @@ -217,9 +219,11 @@ static bool fill_sd(TALLOC_CTX *mem_ctx, } while (0) -#define INIT() \ - TALLOC_CTX *mem_ctx = talloc_new(NULL); \ - struct security_token token = {}; \ +#define INIT() \ + TALLOC_CTX *mem_ctx = talloc_new(NULL); \ + struct security_token token = { \ + .evaluate_claims = CLAIMS_EVALUATION_ALWAYS \ + }; \ struct security_descriptor *sd = NULL; @@ -630,8 +634,8 @@ int main(_UNUSED_ int argc, _UNUSED_ const char **argv) cmocka_unit_test(test_composite_mixed_types), cmocka_unit_test(test_composite_different_order_with_SID_dupes), cmocka_unit_test(test_device_claim_eq_resource_claim_2), - cmocka_unit_test(test_not_Not_Any_of_1), - cmocka_unit_test(test_not_any_of_composite_1), + cmocka_unit_test(test_not_Not_Any_of_1), + cmocka_unit_test(test_not_any_of_composite_1), cmocka_unit_test(test_resource_ace_single), cmocka_unit_test(test_horrible_fuzz_derived_test_4), cmocka_unit_test(test_horrible_fuzz_derived_test_3), diff --git a/selftest/knownfail.d/conditional-ace-token b/selftest/knownfail.d/conditional-ace-token deleted file mode 100644 index fbd38be24de..00000000000 --- a/selftest/knownfail.d/conditional-ace-token +++ /dev/null @@ -1,41 +0,0 @@ -^samba.unittests.run_conditional_ace.test_user_attr_any_of_missing_resource_and_user_attr -^samba.unittests.run_conditional_ace.test_user_attr_any_of_missing_resource_attr -^samba.unittests.run_conditional_ace.test_user_attr_any_of_missing_user_attr -^samba.unittests.run_conditional_ace.test_composite_mixed_types -^samba.unittests.run_conditional_ace.test_composite_different_order_with_SID_dupes -^samba.unittests.run_conditional_ace.test_device_claim_eq_resource_claim_2 -^samba.unittests.run_conditional_ace.test_not_Not_Any_of_1 -^samba.unittests.run_conditional_ace.test_not_any_of_composite_1 -^samba.unittests.run_conditional_ace.test_resource_ace_single -^samba.unittests.run_conditional_ace.test_horrible_fuzz_derived_test_3 -^samba.unittests.run_conditional_ace.test_Device_Member_of_and_Member_of -^samba.unittests.run_conditional_ace.test_resource_ace_multi -^samba.unittests.run_conditional_ace.test_resource_ace_multi_any_of -^samba.unittests.run_conditional_ace.test_user_claim_eq_device_claim -^samba.unittests.run_conditional_ace.test_device_claim_comtains_resource_claim -^samba.unittests.run_conditional_ace.test_device_claim_eq_resource_claim -^samba.unittests.run_conditional_ace.test_Device_claim_contains_Resource_claim -^samba.unittests.run_conditional_ace.test_not_Not_Contains_1 -^samba.unittests.run_conditional_ace.test_not_not_Not_Member_of_fail -^samba.unittests.run_conditional_ace.test_not_not_Not_Member_of -^samba.unittests.run_conditional_ace.test_not_not_not_not_not_not_not_not_not_not_Not_Member_of -^samba.unittests.run_conditional_ace.test_not_any_of_1_fail -^samba.unittests.run_conditional_ace.test_not_any_of_1 -^samba.unittests.run_conditional_ace.test_not_contains_1 -^samba.unittests.run_conditional_ace.test_not_contains_1_fail -^samba.unittests.run_conditional_ace.test_any_of_1_fail -^samba.unittests.run_conditional_ace.test_any_of_1 -^samba.unittests.run_conditional_ace.test_any_of -^samba.unittests.run_conditional_ace.test_any_of_match_last -^samba.unittests.run_conditional_ace.test_contains_incomplete -^samba.unittests.run_conditional_ace.test_contains -^samba.unittests.run_conditional_ace.test_contains_1 -^samba.unittests.run_conditional_ace.test_contains_1_fail -^samba.unittests.run_conditional_ace.test_device_claims_composite -^samba.unittests.run_conditional_ace.test_claim_name_different_case -^samba.unittests.run_conditional_ace.test_claim_name_different_case_case_flag -^samba.unittests.run_conditional_ace.test_different_case_with_case_sensitive_flag -^samba.unittests.run_conditional_ace.test_composite_different_order -^samba.unittests.run_conditional_ace.test_different_case -^samba.unittests.run_conditional_ace.test_composite_different_order_with_dupes -^samba.unittests.run_conditional_ace.test_more_values_not_equal