Set "flags.is_tlv" correctly

diff --git a/src/lib/dict.c b/src/lib/dict.c
index 29cc260..1d5952d 100644 (file)
--- a/src/lib/dict.c
+++ b/src/lib/dict.c
@@ -1108,7 +1108,6 @@ static int process_attribute(const char* fn, const int line,
                        return -1;
                }
 
-#if 0
                /*
                 *      Look up the REAL parent TLV.
                 */
@@ -1117,13 +1116,12 @@ static int process_attribute(const char* fn, const int line,
 
                        parent &= ~(fr_attr_mask[my_depth] << fr_attr_shift[my_depth]);
 
-                       da = dict_attrbyvalue(parent, block_);
+                       da = dict_attrbyvalue(parent, da->vendor);
                        if (!da) {
                                fr_strerror_printf("dict_init: %s[%d]: Parent attribute is undefined.", fn, line);
                                return -1;
                        }
                }
-#endif
                
                /*
                 *      Set which type of attribute this is.

diff --git a/src/lib/radius.c b/src/lib/radius.c
index f6f1376..4b2c477 100644 (file)
--- a/src/lib/radius.c
+++ b/src/lib/radius.c
@@ -783,7 +783,7 @@ static ssize_t vp2data_any(const RADIUS_PACKET *packet,
         */
        VP_TRACE("vp2data_any: %u attr %u -> %u\n",
                 nest, vp->attribute, vp->attribute >> fr_attr_shift[nest + 1]);
-       if ((nest < fr_attr_max_tlv) &&
+       if (vp->flags.is_tlv && (nest < fr_attr_max_tlv) &&
            ((vp->attribute >> fr_attr_shift[nest + 1]) != 0)) {
                return vp2data_tlvs(packet, original, secret, nest + 1, pvp,
                                    start, room);