Merge pull request #1727 from jrouzierinverse/feature/eap-fast-3.0.x

Feature/eap fast 3.0.x

diff --combined src/lib/dict.c
index 273dd87,2d89526..5b44f77
--- 1/src/lib/dict.c
--- 2/src/lib/dict.c
+++ b/src/lib/dict.c
@@@ -643,7 -643,7 +643,7 @@@ int dict_valid_name(char const *name
  /*
   *    Find the parent of the attr/vendor.
   */
- static DICT_ATTR const *dict_parent(unsigned int attr, unsigned int vendor)
+ DICT_ATTR const *dict_parent(unsigned int attr, unsigned int vendor)
  {
        int i;
        unsigned int base_vendor;
@@@ -1376,7 -1376,8 +1376,7 @@@ int dict_str2oid(char const *ptr, unsig
  {
        char const *p;
        unsigned int attr;
 -      DICT_ATTR const *da = NULL;
 -
 +      
  #ifdef WITH_DICT_OID_DEBUG
        fprintf(stderr, "PARSING %s tlv_depth %d pvalue %08x pvendor %08x\n", ptr,
                tlv_depth, *pvalue, *pvendor);
@@@ -1417,8 -1418,6 +1417,8 @@@
                 *      We have an OID, look up the attribute to see what it is.
                 */
                if (attr != PW_VENDOR_SPECIFIC) {
 +                      DICT_ATTR const *da;
 +
                        da = dict_attrbyvalue(attr, 0);
                        if (!da) {
                                *pvalue = attr;
@@@ -1546,22 -1545,6 +1546,22 @@@ keep_parsing
                }
  
                attr <<= fr_attr_shift[tlv_depth];
 +
 +#ifdef WITH_DICT_OID_DEBUG
 +              if (*pvendor) {
 +                      DICT_ATTR const *da;
 +
 +                      da = dict_parent(*pvalue | attr, *pvendor);
 +                      if (!da) {
 +                              fprintf(stderr, "STR2OID FAILED PARENT %08x | %08x, %08x\n",
 +                                      *pvalue, attr, *pvendor);
 +                      } else if ((da->attr != *pvalue) || (da->vendor != *pvendor)) {
 +                              fprintf(stderr, "STR2OID DISAGREEMENT WITH PARENT %08x, %08x\t%08x, %08x\n",
 +                                      *pvalue, *pvendor, da->attr, da->vendor);
 +                      }
 +              }
 +#endif
 +
                *pvalue |= attr;
  
  #ifdef WITH_DHCP