From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 15 Dec 2022 02:23:34 +0000 (-0600)
Subject: Fix invalid test
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f1862dd78d2d538bda6bffac89be166ee54b43d;p=thirdparty%2Ffreeradius-server.git

Fix invalid test
---

diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c
index 626341f725f..8c508172524 100644
--- a/src/lib/util/pair.c
+++ b/src/lib/util/pair.c
@@ -2841,8 +2841,6 @@ void fr_pair_verify(char const *file, int line, fr_pair_list_t const *list, fr_p
 	}
 
 	fr_dict_attr_verify(file, line, vp->da);
-	if (vp->data.enumv) fr_dict_attr_verify(file, line, vp->data.enumv);
-
 	if (list) {
 		fr_fatal_assert_msg(fr_pair_order_list_parent(vp) == &list->order,
 				    "CONSISTENCY CHECK FAILED %s[%u]:  pair does not have the correct parentage "
@@ -2850,6 +2848,13 @@ void fr_pair_verify(char const *file, int line, fr_pair_list_t const *list, fr_p
 				    file, line, vp->da->name);
 	}
 
+	/*
+	 *	This field is only valid for non-structural pairs
+	 */
+	if (!fr_type_is_structural(vp->vp_type)) {
+		if (vp->data.enumv) fr_dict_attr_verify(file, line, vp->data.enumv);
+	}
+
 	switch (vp->vp_type) {
 	case FR_TYPE_OCTETS:
 	{