libtinyrad: refactoring tinyrad_dict_builtin()

2 files changed, 8 insertions, 1 deletions

diff --git a/include/tinyrad.h b/include/tinyrad.h
index 609ac5d..0dc52fb 100644
--- a/include/tinyrad.h
+++ b/include/tinyrad.h
@@ -200,6 +200,7 @@
 #define TRAD_SCHEME                 0x00F00000U
 #define TRAD_RADSEC                 (TRAD_RADIUS | TRAD_RADIUS_ACCT | TRAD_RADIUS_DYNAUTH | TRAD_TLS)
 #define TRAD_TCP                    0x01000000U
+#define TRAD_BUILTIN_DICT_LOADED    0x02000000U
 
 #define TRAD_OFF                    0
 #define TRAD_ON                     1
diff --git a/lib/libtinyrad/ldict.c b/lib/libtinyrad/ldict.c
index 37666c7..c2b9f34 100644
--- a/lib/libtinyrad/ldict.c
+++ b/lib/libtinyrad/ldict.c
@@ -1388,11 +1388,17 @@ tinyrad_dict_builtin(
          TinyRadDict *                 dict,
          char ***                      msgsp )
 {
+   int rc;
    TinyRadDebugTrace();
    assert(dict != NULL);
    if (tinyrad_dict_is_readonly(dict) == TRAD_YES)
       return(TRAD_EDICTRO);
-   return(tinyrad_dict_import(dict, tinyrad_dict_default_vendors, tinyrad_dict_default_attrs, tinyrad_dict_default_values, msgsp));
+   if ((dict->opts & TRAD_BUILTIN_DICT_LOADED))
+      return(TRAD_SUCCESS);
+   if ((rc = tinyrad_dict_import(dict, tinyrad_dict_default_vendors, tinyrad_dict_default_attrs, tinyrad_dict_default_values, msgsp)) != TRAD_SUCCESS)
+      return(rc);
+   dict->opts |= TRAD_BUILTIN_DICT_LOADED;
+   return(TRAD_SUCCESS);
 }