From: Alan T. DeKok <aland@freeradius.org>
Date: Sun, 24 Sep 2023 13:49:55 +0000 (-0400)
Subject: if we have local dict, look up next by name, too
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7097defd84060066f791ce7db04fbc2e2dcc9804;p=thirdparty%2Ffreeradius-server.git

if we have local dict, look up next by name, too
---

diff --git a/src/lib/util/dict_util.c b/src/lib/util/dict_util.c
index b9495db8234..193976b9e1f 100644
--- a/src/lib/util/dict_util.c
+++ b/src/lib/util/dict_util.c
@@ -2773,7 +2773,6 @@ redo:
 				parent = dict->next->root;
 				goto redo;
 			}
-
 		}
 
 		if (err) *err = FR_DICT_ATTR_NOTFOUND;
@@ -2801,15 +2800,26 @@ fr_dict_attr_t *dict_attr_by_name(fr_dict_attr_err_t *err, fr_dict_attr_t const
 
 	DA_VERIFY(parent);
 
+redo:
 	namespace = dict_attr_namespace(parent);
 	if (!namespace) {
 		fr_strerror_printf("Attribute '%s' does not contain a namespace", parent->name);
 		if (err) *err = FR_DICT_ATTR_NO_CHILDREN;
+		fprintf(stderr, "FAIL %d\n", __LINE__);
 		return NULL;
 	}
 
 	da = fr_hash_table_find(namespace, &(fr_dict_attr_t) { .name = name });
 	if (!da) {
+		if (parent->flags.is_root) {
+			fr_dict_t const *dict = fr_dict_by_da(parent);
+
+			if (dict->next) {
+				parent = dict->next->root;
+				goto redo;
+			}
+		}
+
 		if (err) *err = FR_DICT_ATTR_NOTFOUND;
 		fr_strerror_printf("Attribute '%s' not found in namespace '%s'", name, parent->name);
 		return NULL;