From: Joseph Sutton Date: Thu, 21 Sep 2023 03:44:04 +0000 (+1200) Subject: libcli/security: Remove bool_value member X-Git-Tag: tevent-0.16.0~395 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5568a0a5e56f42b779af07a0db5033b6bbc42c3;p=thirdparty%2Fsamba.git libcli/security: Remove bool_value member ‘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 Reviewed-by: Andrew Bartlett --- diff --git a/libcli/security/claims-conversions.c b/libcli/security/claims-conversions.c index 8c7253242bc..9f8222e1c08 100644 --- a/libcli/security/claims-conversions.c +++ b/libcli/security/claims-conversions.c @@ -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; diff --git a/librpc/idl/security.idl b/librpc/idl/security.idl index 903b00c0c92..db351bdd52f 100644 --- a/librpc/idl/security.idl +++ b/librpc/idl/security.idl @@ -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 {