--- gvpe/src/conf.C	2012/12/04 10:29:43	1.59
+++ gvpe/src/conf.C	2013/07/16 16:44:36	1.61
@@ -163,7 +163,9 @@
   dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING;
 #endif
 
-  conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
+  pidfilename   = strdup (LOCALSTATEDIR "/run/gvpe.pid");
+  seed_dev      = strdup ("/dev/urandom");
+  reseed        = DEFAULT_RESEED;
 }
 
 void
@@ -174,6 +176,7 @@
 
   rsa_key = 0;
 
+  free (seed_dev);           seed_dev           = 0;
   free (pidfilename);        pidfilename        = 0;
   free (ifname);             ifname             = 0;
 #if ENABLE_HTTP_PROXY
@@ -353,6 +356,10 @@
     conf.mtu = atoi (val);
   else if (!strcmp (var, "nfmark"))
     conf.nfmark = atoi (val);
+  else if (!strcmp (var, "seed-device"))
+    free (conf.seed_dev), conf.seed_dev = strdup (val);
+  else if (!strcmp (var, "seed-interval"))
+    conf.reseed = atoi (val);
   else if (!strcmp (var, "if-up"))
     free (conf.script_if_up), conf.script_if_up = strdup (val);
   else if (!strcmp (var, "node-up"))
@@ -631,10 +638,11 @@
     }
   else
     {
-      slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
-
       if (need_keys)
-        exit (EXIT_FAILURE);
+        {
+          slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
+          exit (EXIT_FAILURE);
+        }
     }
 
   free (fname);
@@ -648,6 +656,9 @@
         exit (EXIT_FAILURE);
       }
 
+  fname = conf.config_filename (conf.pidfilename);
+  free (conf.pidfilename); conf.pidfilename = fname;
+
   for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
     (*i)->finalise ();
 }
@@ -657,7 +668,7 @@
 {
   char *fname;
 
-  asprintf (&fname, name ? name : dflt, ::thisnode);
+  asprintf (&fname, name ? name : dflt, ::thisnode ? ::thisnode : "<unset>");
 
   if (!ABSOLUTE_PATH (fname))
     {