From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 1 Dec 2021 14:32:54 +0000 (-0600)
Subject: Don't exit the resolver loop when we hit a XLAT_GROUP
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37e12565e4e026b9f78806eb57ccd667036f8365;p=thirdparty%2Ffreeradius-server.git

Don't exit the resolver loop when we hit a XLAT_GROUP
---

diff --git a/src/lib/unlang/xlat_tokenize.c b/src/lib/unlang/xlat_tokenize.c
index c0976bb4b0c..8b369b3fdfc 100644
--- a/src/lib/unlang/xlat_tokenize.c
+++ b/src/lib/unlang/xlat_tokenize.c
@@ -1639,7 +1639,8 @@ int xlat_resolve(xlat_exp_t **head, xlat_flags_t *flags, xlat_res_rules_t const
 
 		switch (node->type) {
 		case XLAT_GROUP:
-			return xlat_resolve(&node->child, &node->flags, xr_rules);
+			if (xlat_resolve(&node->child, &node->flags, xr_rules) < 0) return -1;
+			break;
 
 		/*
 		 *	Alternate expansion a || b