From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 6 Mar 2024 21:02:24 +0000 (-0600)
Subject: Return nested mismatch, not parents
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79c54ce001effba08869e67cc67daa7ae1259954;p=thirdparty%2Ffreeradius-server.git

Return nested mismatch, not parents
---

diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c
index a09e11c2792..8010c54aef8 100644
--- a/src/lib/util/pair.c
+++ b/src/lib/util/pair.c
@@ -2134,7 +2134,11 @@ bool fr_pair_validate(fr_pair_t const *failed[2], fr_pair_list_t *filter, fr_pai
 		 */
 		switch (check->vp_type) {
 		case FR_TYPE_STRUCTURAL:
-			if (!fr_pair_validate(failed, &check->vp_group, &match->vp_group)) goto mismatch;
+			/*
+			 *	Return from here on failure, so that the nested mismatch
+			 *	information is preserved.
+			 */
+			if (!fr_pair_validate(failed, &check->vp_group, &match->vp_group)) return false;
 			break;
 
 		default: