]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Return nested mismatch, not parents
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Wed, 6 Mar 2024 21:02:24 +0000 (15:02 -0600)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Wed, 6 Mar 2024 21:02:24 +0000 (15:02 -0600)
src/lib/util/pair.c

index a09e11c27920511df9644c8394e734cafc0703c3..8010c54aef8e59bba1319808e13c34be978b37ac 100644 (file)
@@ -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: