libtinyrad: adding tinyrad_dict_defaults()

3 files changed, 55 insertions, 39 deletions

diff --git a/lib/libtinyrad/ldict.c b/lib/libtinyrad/ldict.c
index c2b9f34..6a12fbe 100644
--- a/lib/libtinyrad/ldict.c
+++ b/lib/libtinyrad/ldict.c
@@ -694,6 +694,47 @@ tinyrad_dict_add_vendor(
 }
 
 
+int
+tinyrad_dict_defaults(
+         TinyRadDict *                 dict,
+         char ***                      msgsp,
+         int                           opts )
+{
+   int      rc;
+
+   if (!(dict))
+      return(TRAD_SUCCESS);
+
+   // adjust options
+   opts &= ~(dict->opts_neg);
+   opts |= dict->opts;
+
+   // load built-in dictionary
+   if ((opts & TRAD_BUILTIN_DICT))
+      if ((rc = tinyrad_dict_builtin(dict, msgsp)) != TRAD_SUCCESS)
+         return(rc);
+
+   // load default dictionary file
+   if ((dict->default_dictfile))
+   {
+      switch(rc = tinyrad_dict_parse(dict, dict->default_dictfile, NULL, 0))
+      {
+         case TRAD_SUCCESS:
+         break;
+
+         case TRAD_ENOMEM:
+         case TRAD_EUNKNOWN:
+         return(rc);
+
+         default:
+         break;
+      };
+   };
+
+   return(TRAD_SUCCESS);
+}
+
+
 /// Initialize dicitionary file buffer
 ///
 /// @param[in]  dict          dictionary reference
@@ -847,32 +888,11 @@ tinyrad_dict_initialize(
       return(rc);
    };
 
-   // load builtin dictionary
-   if ((dict->opts & TRAD_BUILTIN_DICT) == TRAD_BUILTIN_DICT)
+   // load builtin dictionary and default dictionary file
+   if ((rc = tinyrad_dict_defaults(dict, NULL, opts)) != TRAD_SUCCESS)
    {
-      if ((rc = tinyrad_dict_builtin(dict, NULL)) != TRAD_SUCCESS)
-      {
-         tinyrad_dict_free(dict);
-         return(rc);
-      };
-   };
-
-   // load default dictionary file
-   if ((dict->default_dictfile))
-   {
-      switch(rc = tinyrad_dict_parse(dict, dict->default_dictfile, NULL, 0))
-      {
-         case TRAD_SUCCESS:
-         break;
-
-         case TRAD_ENOMEM:
-         case TRAD_EUNKNOWN:
-         tinyrad_dict_free(dict);
-         return(rc);
-
-         default:
-         break;
-      };
+      tinyrad_dict_free(dict);
+      return(rc);
    };
 
    *dictp = tinyrad_obj_retain(&dict->obj);
diff --git a/lib/libtinyrad/ldict.h b/lib/libtinyrad/ldict.h
index 3fd5da4..3bd6c1b 100644
--- a/lib/libtinyrad/ldict.h
+++ b/lib/libtinyrad/ldict.h
@@ -147,6 +147,13 @@ tinyrad_dict_attr_oidname(
          const TinyRadOID *            oid );
 
 
+int
+tinyrad_dict_defaults(
+         TinyRadDict *                 dict,
+         char ***                      msgsp,
+         int                           opts );
+
+
 TinyRadDictValue *
 tinyrad_dict_value_lookup(
          TinyRadDict *                 dict,
diff --git a/lib/libtinyrad/lmemory.c b/lib/libtinyrad/lmemory.c
index 421f01c..d160e91 100644
--- a/lib/libtinyrad/lmemory.c
+++ b/lib/libtinyrad/lmemory.c
@@ -331,21 +331,10 @@ tinyrad_initialize(
    // load default dictionary file and make read-only
    if (!(dict))
    {
-      if ((tr->dict->default_dictfile))
+      if ((rc = tinyrad_dict_defaults(tr->dict, NULL, (TRAD_BUILTIN_DICT|opts))) != TRAD_SUCCESS)
       {
-         switch(rc = tinyrad_dict_parse(tr->dict, tr->dict->default_dictfile, NULL, 0))
-         {
-            case TRAD_SUCCESS:
-            break;
-
-            case TRAD_ENOMEM:
-            case TRAD_EUNKNOWN:
-            tinyrad_tiyrad_free(tr);
-            return(rc);
-
-            default:
-            break;
-         };
+         tinyrad_tiyrad_free(tr);
+         return(rc);
       };
       opt = TRAD_YES;
       tinyrad_dict_set_option(tr->dict, TRAD_DICT_OPT_READONLY, &opt);