From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 1 Jun 2022 19:59:33 +0000 (-0400)
Subject: don't treat exec as xlat
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fae6a1245ef0427c7720b034e3ff2ad3c6f3467;p=thirdparty%2Ffreeradius-server.git

don't treat exec as xlat
---

diff --git a/src/lib/unlang/xlat_expr.c b/src/lib/unlang/xlat_expr.c
index b0adcef4c54..994a624166a 100644
--- a/src/lib/unlang/xlat_expr.c
+++ b/src/lib/unlang/xlat_expr.c
@@ -1634,9 +1634,9 @@ static ssize_t tokenize_field(xlat_exp_head_t *head, xlat_exp_t **out, fr_sbuff_
 
 	/*
 	 *	Don't keep an intermediate tmpl for xlats.  Just hoist
-	 *	the xlat to be a child of this node.
+	 *	the xlat to be a child of this node, unless it's an exec.
 	 */
-	if (tmpl_contains_xlat(node->vpt)) {
+	if (tmpl_contains_xlat(node->vpt) && !tmpl_is_exec(node->vpt)) {
 		xlat_exp_head_t *xlat = tmpl_xlat(node->vpt);
 
 		talloc_steal(node, xlat);