4 files changed, 28 insertions, 0 deletions

diff --git a/doc/tinyrad.conf-example.in b/doc/tinyrad.conf-example.in
index 4078ba1..a0adab8 100644
--- a/doc/tinyrad.conf-example.in
+++ b/doc/tinyrad.conf-example.in
@@ -8,6 +8,7 @@
 #URI                 "radius://localhost/secret"
 #BIND_ADDRESS        "::1 127.0.0.1"
 #SECRET              "RaDiUsSeCrEt"
+#SECRET_FILE         "%d/.tinyrad.secret"
 
 #TIMEOUT             5
 #NETWORK_TIMEOUT     3
diff --git a/include/tinyrad.h b/include/tinyrad.h
index e869624..80e9e3b 100644
--- a/include/tinyrad.h
+++ b/include/tinyrad.h
@@ -223,6 +223,7 @@
 #define TRAD_OPT_SCHEME                12
 #define TRAD_OPT_DICTIONARY            13
 #define TRAD_OPT_SECRET                14
+#define TRAD_OPT_SECRET_FILE           15
 
 // dictionary get options
 #define TRAD_DICT_OPT_REF_COUNT           1  // used by TinyRadDict, TinyRadDictVendor and TinyRadDictAttr
diff --git a/lib/libtinyrad/lconf.c b/lib/libtinyrad/lconf.c
index 5421457..b178b8f 100644
--- a/lib/libtinyrad/lconf.c
+++ b/lib/libtinyrad/lconf.c
@@ -202,6 +202,9 @@ tinyrad_conf_environment(
    if ((value = getenv("TINYRAD_SECRET")) != NULL)
       tinyrad_conf_opt(tr, dict, "secret", value);
 
+   if ((value = getenv("TINYRAD_SECRET_FILE")) != NULL)
+      tinyrad_conf_opt(tr, dict, "secret_file", value);
+
    if ((value = getenv("TINYRAD_TIMEOUT")) != NULL)
       tinyrad_conf_opt(tr, dict, "timeout", value);
 
@@ -341,6 +344,13 @@ tinyrad_conf_opt(
    {
       if ( (!(tr)) || ((tr->secret)) || (!(value)) )
          return(TRAD_SUCCESS);
+      return(tinyrad_set_option(tr, TRAD_OPT_SECRET_FILE, value));
+   };
+
+  if (!(strcasecmp(name, "secret_file")))
+   {
+      if ( (!(tr)) || ((tr->secret)) || (!(value)) )
+         return(TRAD_SUCCESS);
       return(tinyrad_set_option(tr, TRAD_OPT_SECRET, value));
    };
 
diff --git a/lib/libtinyrad/lmemory.c b/lib/libtinyrad/lmemory.c
index de18bff..018db0c 100644
--- a/lib/libtinyrad/lmemory.c
+++ b/lib/libtinyrad/lmemory.c
@@ -55,6 +55,7 @@
 
 #include "lconf.h"
 #include "ldict.h"
+#include "lfile.h"
 #include "lstrings.h"
 
 
@@ -250,6 +251,10 @@ tinyrad_get_option(
          return(TRAD_ENOMEM);
       break;
 
+      case TRAD_OPT_SECRET_FILE:
+      TinyRadDebug(TRAD_DEBUG_ARGS, "   == %s( tr, TRAD_OPT_SECRET_FILE, outvalue )", __func__);
+      return(TRAD_EOPTERR);
+
       case TRAD_OPT_SOCKET_BIND_ADDRESSES:
       TinyRadDebug(TRAD_DEBUG_ARGS, "   == %s( tr, TRAD_OPT_SOCKET_BIND_ADDRESSES, outvalue )", __func__);
       inet_ntop(AF_INET, &tr->bind_sa->sin_addr, bind_buff, sizeof(struct sockaddr_in));
@@ -431,6 +436,7 @@ tinyrad_set_option(
    uint32_t             opts;
    int                  rc;
    TinyRadURLDesc *     trud;
+   char                 buff[256];
 
    TinyRadDebugTrace();
 
@@ -529,6 +535,16 @@ tinyrad_set_option(
          return(TRAD_ENOMEM);
       break;
 
+      case TRAD_OPT_SECRET_FILE:
+      TinyRadDebug(TRAD_DEBUG_ARGS, "   == %s( tr, TRAD_OPT_SECRET_FILE, \"%s\" )", __func__, (const char *)invalue);
+      if ((rc = tinyrad_filetostr(buff, (const char *)invalue, sizeof(buff))) != TRAD_SUCCESS)
+         return(rc);
+      if ((tr->secret))
+         free(tr->secret);
+      if ((tr->secret = tinyrad_strdup(buff)) == NULL)
+         return(TRAD_ENOMEM);
+      break;
+
       case TRAD_OPT_SOCKET_BIND_ADDRESSES:
       TinyRadDebug(TRAD_DEBUG_ARGS, "   == %s( tr, TRAD_OPT_SOCKET_BIND_ADDRESSES, invalue )", __func__);
       if (tr->s != -1)