[ViewVC] Diff of: cvs/gvpe/src/conf.C

Comparing gvpe/src/conf.C (file contents):
Revision 1.60 by root, Sat Jul 13 04:10:29 2013 UTC vs.
Revision 1.61 by root, Tue Jul 16 16:44:36 2013 UTC

       fclose (f);
     }
   else
     {
-      slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
       if (need_keys)
+        {
+          slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
-        exit (EXIT_FAILURE);
+          exit (EXIT_FAILURE);
+        }
     }
   free (fname);
   if (need_keys && ::thisnode
       {
         slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
         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 ();
 }
 char *
 configuration::config_filename (const char *name, const char *dflt)
 {
   char *fname;
-  asprintf (&fname, name ? name : dflt, ::thisnode);
+  asprintf (&fname, name ? name : dflt, ::thisnode ? ::thisnode : "<unset>");
   if (!ABSOLUTE_PATH (fname))
     {
       char *rname = fname;
       asprintf (&fname, "%s/%s", confbase, rname);

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines