handle ALIAS attributes when parsing

so that we create the full tree, and not a partial one

diff --git a/src/lib/util/pair_legacy.c b/src/lib/util/pair_legacy.c
index 3eed1c66694e5b606879dae0ad4618bb347d058f..465d9195631deb6de7b4aaf311c6d26ac25fa9ee 100644 (file)
--- a/src/lib/util/pair_legacy.c
+++ b/src/lib/util/pair_legacy.c
@@ -519,8 +519,19 @@ redo:
                        goto leaf;
                } else {
                leaf:
-                       if (fr_pair_append_by_da(relative->ctx, &vp, relative->list, da) < 0) {
-                               return fr_sbuff_error(&our_in);
+                       /*
+                        *      In the common case, we jump ahead one level.
+                        *
+                        *      But for ALIAS, we may jump ahead multiple levels.
+                        */
+                       if ((relative->da->depth + 1) == da->depth) {
+                               if (fr_pair_append_by_da(relative->ctx, &vp, relative->list, da) < 0) {
+                                       return fr_sbuff_error(&our_in);
+                               }
+                       } else {
+                               vp = fr_pair_afrom_da_depth_nested(relative->ctx, relative->list, da,
+                                                                  relative->da->depth);
+                               if (!vp) return fr_sbuff_error(&our_in);
                        }
                }