From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 2 Oct 2023 13:04:33 +0000 (-0400)
Subject: cmp functions have required arguments
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=224efc7e3e6ba6399293fff8dee812a2e7700b6d;p=thirdparty%2Ffreeradius-server.git

cmp functions have required arguments
---

diff --git a/src/lib/unlang/xlat_expr.c b/src/lib/unlang/xlat_expr.c
index 1c6305ae032..5ebace69c82 100644
--- a/src/lib/unlang/xlat_expr.c
+++ b/src/lib/unlang/xlat_expr.c
@@ -457,6 +457,12 @@ XLAT_BINARY_FUNC(op_xor,  T_XOR)
 XLAT_BINARY_FUNC(op_rshift, T_RSHIFT)
 XLAT_BINARY_FUNC(op_lshift, T_LSHIFT)
 
+static xlat_arg_parser_t const binary_cmp_xlat_args[] = {
+	{ .required = true, .type = FR_TYPE_VOID },
+	{ .required = true, .type = FR_TYPE_VOID },
+	XLAT_ARG_PARSER_TERMINATOR
+};
+
 #define XLAT_CMP_FUNC(_name, _op)  \
 static xlat_action_t xlat_func_ ## _name(TALLOC_CTX *ctx, fr_dcursor_t *out, \
 				   xlat_ctx_t const *xctx, \
@@ -1622,7 +1628,7 @@ do { \
 #define XLAT_REGISTER_BINARY_CMP(_op, _name) \
 do { \
 	if (unlikely((xlat = xlat_func_register(NULL, "cmp_" STRINGIFY(_name), xlat_func_cmp_ ## _name, FR_TYPE_VOID)) == NULL)) return -1; \
-	xlat_func_args_set(xlat, binary_op_xlat_args); \
+	xlat_func_args_set(xlat, binary_cmp_xlat_args); \
 	xlat_func_flags_set(xlat, XLAT_FUNC_FLAG_PURE | XLAT_FUNC_FLAG_INTERNAL); \
 	xlat_func_print_set(xlat, xlat_expr_print_binary); \
 	xlat_func_resolve_set(xlat, xlat_expr_resolve_binary); \