From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 28 Apr 2022 14:41:04 +0000 (-0400)
Subject: parent things properly
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c929010036f0834597bc6c67c0581b258e158899;p=thirdparty%2Ffreeradius-server.git

parent things properly
---

diff --git a/src/lib/unlang/xlat_expr.c b/src/lib/unlang/xlat_expr.c
index 4925da3f9db..d27f2dd2383 100644
--- a/src/lib/unlang/xlat_expr.c
+++ b/src/lib/unlang/xlat_expr.c
@@ -250,7 +250,7 @@ static xlat_exp_t *xlat_groupify_node(TALLOC_CTX *ctx, xlat_exp_t *node)
 	group->flags = node->flags;
 
 	if (node->next) {
-		group->next = xlat_groupify_node(ctx, node->next);
+		group->next = xlat_groupify_node(group, node->next);
 		node->next = NULL;
 	}
 
diff --git a/src/lib/unlang/xlat_tokenize.c b/src/lib/unlang/xlat_tokenize.c
index a3d8b5e1505..97976a07578 100644
--- a/src/lib/unlang/xlat_tokenize.c
+++ b/src/lib/unlang/xlat_tokenize.c
@@ -1440,7 +1440,7 @@ ssize_t xlat_tokenize_argv(TALLOC_CTX *ctx, xlat_exp_head_t **out, xlat_flags_t
 		 *	Barewords --may-contain=%{expansions}
 		 */
 		case T_BARE_WORD:
-			if (xlat_tokenize_string(node, &node->group->next, &node->flags, &our_in,
+			if (xlat_tokenize_string(node->group, &node->group->next, &node->flags, &our_in,
 						  false, our_p_rules, t_rules) < 0) {
 			error:
 				if (our_p_rules != &value_parse_rules_bareword_quoted) {
@@ -1457,7 +1457,7 @@ ssize_t xlat_tokenize_argv(TALLOC_CTX *ctx, xlat_exp_head_t **out, xlat_flags_t
 		 *	"Double quoted strings may contain %{expansions}"
 		 */
 		case T_DOUBLE_QUOTED_STRING:
-			if (xlat_tokenize_string(node, &node->group->next, &node->flags, &our_in,
+			if (xlat_tokenize_string(node->group, &node->group->next, &node->flags, &our_in,
 						  false, &value_parse_rules_double_quoted, t_rules) < 0) goto error;
 			xlat_flags_merge(flags, &node->flags);
 			break;
@@ -1470,7 +1470,7 @@ ssize_t xlat_tokenize_argv(TALLOC_CTX *ctx, xlat_exp_head_t **out, xlat_flags_t
 			char		*str;
 			xlat_exp_t	*child;
 
-			node->group->next = child = xlat_exp_alloc_null(node);
+			node->group->next = child = xlat_exp_alloc_null(node->group);
 			xlat_exp_set_type(child, XLAT_BOX);
 
 			slen = fr_sbuff_out_aunescape_until(child, &str, &our_in, SIZE_MAX,