From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 9 Jun 2022 00:51:23 +0000 (-0400)
Subject: hoist unresolved xlats, too
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a9171f68b6755b8420c795e480e885b6f8ec341;p=thirdparty%2Ffreeradius-server.git

hoist unresolved xlats, too
---

diff --git a/src/lib/unlang/xlat_expr.c b/src/lib/unlang/xlat_expr.c
index e3b762ef2fb..8250c3397e7 100644
--- a/src/lib/unlang/xlat_expr.c
+++ b/src/lib/unlang/xlat_expr.c
@@ -1793,7 +1793,7 @@ static ssize_t tokenize_field(xlat_exp_head_t *head, xlat_exp_t **out, fr_sbuff_
 	 *	the xlat to be a child of this node. Exec and regexes
 	 *	are left alone, as they are handled by different code.
 	 */
-	if (tmpl_is_xlat(node->vpt)) {
+	if (tmpl_contains_xlat(node->vpt) && !tmpl_is_exec(node->vpt) && !tmpl_contains_regex(node->vpt)) {
 		xlat_exp_head_t *xlat = tmpl_xlat(node->vpt);
 
 		talloc_steal(node, xlat);