From: Nick Porter <nick@portercomputing.co.uk>
Date: Thu, 5 Oct 2023 18:33:58 +0000 (+0100)
Subject: Revert to real dictionary if that's where the attribute is found
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=457399bb2a17bc5a8ab402015be101e898a78fdb;p=thirdparty%2Ffreeradius-server.git

Revert to real dictionary if that's where the attribute is found
---

diff --git a/src/lib/server/tmpl_tokenize.c b/src/lib/server/tmpl_tokenize.c
index 7ec5bd8c96..68bea073c0 100644
--- a/src/lib/server/tmpl_tokenize.c
+++ b/src/lib/server/tmpl_tokenize.c
@@ -1734,6 +1734,12 @@ static inline int tmpl_attr_afrom_attr_substr(TALLOC_CTX *ctx, tmpl_attr_error_t
 			ar = NULL;
 
 		} else {
+			/*
+			 *	If we searched in a local dictionary, but found a real attribute
+			 *	switch the namespace.
+			 */
+			if (!da->flags.local && namespace->flags.local) namespace = our_parent = fr_dict_root(da->dict);
+
 			/*
 			 *	We had an alias in the same namespace,
 			 *	go add more things in.