libtinyrad: making URI argument optional in tinyrad_initialize()

2 files changed, 17 insertions, 4 deletions

diff --git a/include/tinyrad.h b/include/tinyrad.h
index 0dc52fb..d962f13 100644
--- a/include/tinyrad.h
+++ b/include/tinyrad.h
@@ -254,6 +254,7 @@
 #define TRAD_DEBUG_ANY              (~0x00)
 
 // library defaults
+#define TRAD_DFLT_URI                     "radius://localhost/"
 #define TRAD_DFLT_DEBUG_IDENT             "libtinyrad"
 #define TRAD_DFLT_DEBUG_LEVEL             TRAD_DEBUG_NONE
 #define TRAD_DFLT_DEBUG_SYSLOG            TRAD_OFF
diff --git a/lib/libtinyrad/lmemory.c b/lib/libtinyrad/lmemory.c
index c798c5c..d329931 100644
--- a/lib/libtinyrad/lmemory.c
+++ b/lib/libtinyrad/lmemory.c
@@ -294,7 +294,6 @@ tinyrad_initialize(
    TinyRadDebugTrace();
 
    assert(trp    != NULL);
-   assert(url    != NULL);
 
    TinyRadDebug(TRAD_DEBUG_ARGS, "   == %s( \"%s\", 0x08x )", __func__, url, opts);
 
@@ -305,10 +304,13 @@ tinyrad_initialize(
    tr->timeout    = -1;
 
    // parses and saves URL
-   if ((rc = tinyrad_set_option(tr, TRAD_OPT_URI, url)) != TRAD_SUCCESS)
+   if ((url))
    {
-      tinyrad_tiyrad_free(tr);
-      return(rc);
+      if ((rc = tinyrad_set_option(tr, TRAD_OPT_URI, url)) != TRAD_SUCCESS)
+      {
+         tinyrad_tiyrad_free(tr);
+         return(rc);
+      };
    };
 
    // retain or initialize dictionary
@@ -340,6 +342,16 @@ tinyrad_initialize(
       tinyrad_dict_set_option(tr->dict, TRAD_DICT_OPT_READONLY, &opt);
    };
 
+   // sets default URI
+   if (!(tr->trud))
+   {
+      if ((rc = tinyrad_set_option(tr, TRAD_OPT_URI, TRAD_DFLT_URI)) != TRAD_SUCCESS)
+      {
+         tinyrad_tiyrad_free(tr);
+         return(rc);
+      };
+   };
+
    // sets default bind addresses
    if ( (!(tr->bind_sa)) || (!(tr->bind_sa6)) )
    {