4 files changed, 30 insertions, 2 deletions

diff --git a/include/tinyrad.h b/include/tinyrad.h
index b0b08e4..fa3ed50 100644
--- a/include/tinyrad.h
+++ b/include/tinyrad.h
@@ -682,6 +682,7 @@ tinyrad_get_option(
 _TINYRAD_F int
 tinyrad_initialize(
          TinyRad **                    trp,
+         TinyRadDict *                 dict,
          const char *                  url,
          uint64_t                      opts );
 
diff --git a/lib/libtinyrad/lmemory.c b/lib/libtinyrad/lmemory.c
index 65a3d21..8eb03d1 100644
--- a/lib/libtinyrad/lmemory.c
+++ b/lib/libtinyrad/lmemory.c
@@ -53,6 +53,8 @@
 #include <netdb.h>
 #include <assert.h>
 
+#include "ldict.h"
+
 
 ///////////////////
 //               //
@@ -120,6 +122,9 @@ tinyrad_tiyrad_free(
 
    assert(tr != NULL);
 
+   if ((tr->dict))
+      tinyrad_obj_release(&tr->dict->obj);
+
    if ((tr->trud))
       tinyrad_urldesc_free(tr->trud);
    tr->trud = NULL;
@@ -268,6 +273,7 @@ tinyrad_get_option(
 int
 tinyrad_initialize(
          TinyRad **                    trp,
+         TinyRadDict *                 dict,
          const char *                  url,
          uint64_t                      opts )
 {
@@ -351,6 +357,27 @@ tinyrad_initialize(
       return(rc);
    };
 
+   // duplicate or initialize dictionary
+   if ((dict))
+   {
+      if ((rc = tinyrad_dict_dup(&tr->dict, dict)) != TRAD_SUCCESS)
+      {
+         tinyrad_tiyrad_free(tr);
+         return(rc);
+      };
+   } else {
+      if ((rc = tinyrad_dict_initialize(&tr->dict, 0)) != TRAD_SUCCESS)
+      {
+         tinyrad_tiyrad_free(tr);
+         return(rc);
+      };
+      if ((rc = tinyrad_dict_defaults(tr->dict, NULL, 0)) != TRAD_SUCCESS)
+      {
+         tinyrad_tiyrad_free(tr);
+         return(rc);
+      };
+   };
+
    *trp = tinyrad_obj_retain(&tr->obj);
 
    return(TRAD_SUCCESS);
diff --git a/src/tinyrad.c b/src/tinyrad.c
index 97c5fb1..8c5a822 100644
--- a/src/tinyrad.c
+++ b/src/tinyrad.c
@@ -215,7 +215,7 @@ int main(int argc, char * argv[])
       return(0);
    };
 
-   if ((tinyrad_initialize(&tr, url, 0)) != TRAD_SUCCESS)
+   if ((tinyrad_initialize(&tr, dict, url, 0)) != TRAD_SUCCESS)
    {
       tinyrad_free(dict);
       return(1);
diff --git a/tests/test-options.c b/tests/test-options.c
index 4a1b250..a72cda9 100644
--- a/tests/test-options.c
+++ b/tests/test-options.c
@@ -210,7 +210,7 @@ int main( int argc, char * argv[] )
       tinyrad_set_option(NULL, TRAD_OPT_DEBUG_LEVEL,  &debug);
 
    // initialize tinyrad
-   if ((rc = tinyrad_initialize(&tr, "radius://localhost/secret", 0)) != TRAD_SUCCESS)
+   if ((rc = tinyrad_initialize(&tr, NULL, "radius://localhost/secret", 0)) != TRAD_SUCCESS)
       return(our_error(opts, NULL, "tinyrad_initialize(tr, \"radius://localhost/secret\", 0): %s", tinyrad_strerror(rc)));
 
    // TRAD_OPT_DESC