From: Nick Porter <nick@portercomputing.co.uk>
Date: Wed, 21 Feb 2024 14:59:45 +0000 (+0000)
Subject: Don't assert when unresolved lhs is allowed in map building
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2ba935cf87672692b65914f0242991be3fd8b5a;p=thirdparty%2Ffreeradius-server.git

Don't assert when unresolved lhs is allowed in map building
---

diff --git a/src/lib/server/map.c b/src/lib/server/map.c
index bcf451c5a9c..a723e416a10 100644
--- a/src/lib/server/map.c
+++ b/src/lib/server/map.c
@@ -728,7 +728,7 @@ check_for_child:
 	}
 
 	if (parent_p) {
-		if (tmpl_attr_tail_da_is_structural(map->lhs)) {
+		if (!tmpl_needs_resolving(map->lhs) && tmpl_attr_tail_da_is_structural(map->lhs)) {
 			*parent_p = map;
 		} else {
 			*parent_p = parent;
@@ -738,7 +738,7 @@ check_for_child:
 	/*
 	 *	Xlat expansions are cast to strings for structural data types.
 	 */
-	if (tmpl_attr_tail_da_is_structural(map->lhs) && (tmpl_is_xlat(map->rhs))) {
+	if (!tmpl_needs_resolving(map->lhs) && tmpl_attr_tail_da_is_structural(map->lhs) && (tmpl_is_xlat(map->rhs))) {
 		tmpl_cast_set(map->rhs, FR_TYPE_STRING);
 	}