]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
libcli/security: Remove bool_value member
authorJoseph Sutton <josephsutton@catalyst.net.nz>
Thu, 21 Sep 2023 03:44:04 +0000 (15:44 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 27 Sep 2023 02:43:28 +0000 (02:43 +0000)
‘bool_value’ has the same type as ‘uint_value’. Removing the former
avoids our having more duplicate code than is strictly necessary.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
libcli/security/claims-conversions.c
librpc/idl/security.idl

index 8c7253242bc42d826cb33a1544eaeb16a8e459d1..9f8222e1c086af02193649e7ab0355e9fb70bd6d 100644 (file)
@@ -195,7 +195,7 @@ static bool claim_v1_bool_to_ace_int(
        size_t offset,
        struct ace_condition_token *result)
 {
-       uint64_t v = *claim->values[offset].bool_value;
+       uint64_t v = *claim->values[offset].uint_value;
        result->type = CONDITIONAL_ACE_TOKEN_INT64;
        result->data.int64.base = CONDITIONAL_ACE_INT_BASE_10;
        result->data.int64.sign = CONDITIONAL_ACE_INT_SIGN_NONE;
index 903b00c0c92c69da3a678f85c47d1f63c28e05d3..db351bdd52fdd9385be873be2257c5d3a27bdbe5 100644 (file)
@@ -645,7 +645,7 @@ interface security
                [case(CLAIM_SECURITY_ATTRIBUTE_TYPE_STRING),relative] nstring *string_value;
                [case(CLAIM_SECURITY_ATTRIBUTE_TYPE_SID),relative] DATA_BLOB *sid_value;
                [case(CLAIM_SECURITY_ATTRIBUTE_TYPE_OCTET_STRING),relative] DATA_BLOB *octet_value;
-               [case(CLAIM_SECURITY_ATTRIBUTE_TYPE_BOOLEAN),relative] hyper *bool_value;
+               [case(CLAIM_SECURITY_ATTRIBUTE_TYPE_BOOLEAN),relative] hyper *uint_value;
        } claim_values;
 
        typedef [public,gensize] struct {