--- gvpe/src/vped.C	2004/01/17 14:50:40	1.14
+++ gvpe/src/vped.C	2004/05/10 20:04:25	1.17
@@ -23,6 +23,7 @@
 
 #include <cstdio>
 #include <cstring>
+#include <cstdlib>
 #include <clocale>
 
 #include <errno.h>
@@ -150,8 +151,8 @@
 {
   network.shutdown_all ();
 
-  if (pidfilename)
-    remove_pid (pidfilename);
+  if (conf.pidfilename)
+    remove_pid (conf.pidfilename);
 
   slog (L_INFO, _("terminating with exit code %d"), c);
 
@@ -247,8 +248,8 @@
       slog (L_ERR, _("system call `%s' failed: %s"), "mlockall", strerror (errno));
 #endif
 
-  make_names ();
   conf.read_config (true);
+  make_names ();
 
   set_loglevel (llevel != L_NONE ? llevel : conf.llevel);
 
@@ -256,23 +257,23 @@
 
   if (!THISNODE)
     {
-      slog (L_ERR, _("current node not set, or node '%s' not found in configfile, use the -n switch when starting vped."),
+      slog (L_ERR, _("current node not set, or node '%s' not found in configfile, specify the nodename when starting vped."),
             thisnode ? thisnode : "<unset>");
-      exit (1);
+      exit (EXIT_FAILURE);
     }
 
   if (detach (do_detach))
-    exit (0);
+    exit (EXIT_SUCCESS);
 
   setup_signals ();
 
   if (!network.setup ())
     {
       iom.loop ();
-      cleanup_and_exit (1);
+      cleanup_and_exit (EXIT_FAILURE);
     }
 
   slog (L_ERR, _("unable to setup network, unrecoverable error, exiting."));
-  cleanup_and_exit (1);
+  cleanup_and_exit (EXIT_FAILURE);
 }