From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 27 Jul 2022 12:36:07 +0000 (-0400)
Subject: no need to resolve anything here.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61aaba6f3791bf384257ae65ef88a3267fa70a6e;p=thirdparty%2Ffreeradius-server.git

no need to resolve anything here.
---

diff --git a/src/lib/unlang/xlat_expr.c b/src/lib/unlang/xlat_expr.c
index f4978779496..cd33e373d4f 100644
--- a/src/lib/unlang/xlat_expr.c
+++ b/src/lib/unlang/xlat_expr.c
@@ -1694,6 +1694,9 @@ int xlat_register_expressions(void)
 
 	/*
 	 *	&&, ||
+	 *
+	 *	@todo - remove tmpl_resolve() from tokenize_field(), and add xlat_resolve_logical_or() / xlat_resolve_logical_and()
+	 *	functions which do partial resolution.
 	 */
 	XLAT_REGISTER_NARY_OP(T_LAND, logical_and, logical);
 	XLAT_REGISTER_NARY_OP(T_LOR, logical_or, logical);
@@ -2136,12 +2139,6 @@ static ssize_t tokenize_regex_rhs(xlat_exp_head_t *head, xlat_exp_t **out, fr_sb
 	if (!tmpl_contains_xlat(vpt)) {
 		slen = tmpl_regex_compile(vpt, true);
 		if (slen <= 0) goto error;
-
-	} else if (tmpl_is_unresolved(vpt)) {
-		/*
-		 *	Resolve attributes in xlat'd regular expressions.
-		 */
-		if (tmpl_resolve(vpt, NULL) < 0) goto error;
 	}
 
 	node->vpt = vpt;