From: Volker Lendecke Date: Thu, 28 Nov 2024 17:01:21 +0000 (+0100) Subject: libcli: Remove the "mem_ctx" argument from pull_integer() X-Git-Tag: tdb-1.4.13~322 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=391962e26208ee722dca3367e8a9f793bfa7b079;p=thirdparty%2Fsamba.git libcli: Remove the "mem_ctx" argument from pull_integer() Not needed anymore Signed-off-by: Volker Lendecke Reviewed-by: Pavel Filipenský --- diff --git a/libcli/security/conditional_ace.c b/libcli/security/conditional_ace.c index fec22049183..eb74d9161b3 100644 --- a/libcli/security/conditional_ace.c +++ b/libcli/security/conditional_ace.c @@ -109,10 +109,9 @@ static bool check_integer_range(const struct ace_condition_token *tok) return true; } - -static ssize_t pull_integer(TALLOC_CTX *mem_ctx, - uint8_t *data, size_t length, - struct ace_condition_int *tok) +static ssize_t pull_integer(uint8_t *data, + size_t length, + struct ace_condition_int *tok) { size_t consumed; enum ndr_err_code ndr_err; @@ -333,8 +332,7 @@ static ssize_t pull_composite(TALLOC_CTX *mem_ctx, case CONDITIONAL_ACE_TOKEN_INT16: case CONDITIONAL_ACE_TOKEN_INT32: case CONDITIONAL_ACE_TOKEN_INT64: - consumed = pull_integer(mem_ctx, - el_data, + consumed = pull_integer(el_data, available, &el->data.int64); ok = check_integer_range(el); @@ -590,8 +588,7 @@ struct ace_condition_script *parse_conditional_ace(TALLOC_CTX *mem_ctx, case CONDITIONAL_ACE_TOKEN_INT16: case CONDITIONAL_ACE_TOKEN_INT32: case CONDITIONAL_ACE_TOKEN_INT64: - consumed = pull_integer(program, - tok_data, + consumed = pull_integer(tok_data, available, &tok->data.int64); ok = check_integer_range(tok);