--- gvpe/src/util.C	2004/01/29 18:55:10	1.12
+++ gvpe/src/util.C	2004/05/10 20:13:10	1.14
@@ -48,7 +48,7 @@
 {
   int pid;
 
-  pid = check_pid (pidfilename);
+  pid = check_pid (conf.pidfilename);
 
   if (pid)
     {
@@ -57,7 +57,7 @@
     }
 
   /* if it's locked, write-protected, or whatever */
-  if (!write_pid (pidfilename))
+  if (!write_pid (conf.pidfilename))
     return 1;
 
   return 0;
@@ -68,7 +68,7 @@
 {
   int pid;
 
-  pid = read_pid (pidfilename);
+  pid = read_pid (conf.pidfilename);
 
   if (!pid)
     {
@@ -84,7 +84,7 @@
       fprintf (stderr, _("The vped is no longer running. "));
 
       fprintf (stderr, _("Removing stale lock file.\n"));
-      remove_pid (pidfilename);
+      remove_pid (conf.pidfilename);
     }
 
   return 0;
@@ -114,7 +114,7 @@
 
       /* Now UPDATE the pid in the pidfile, because we changed it... */
 
-      if (!write_pid (pidfilename))
+      if (!write_pid (conf.pidfilename))
         return -1;
 
       log_to (LOGTO_SYSLOG);
@@ -127,16 +127,6 @@
   return 0;
 }
 
-void
-make_names (void)
-{
-  if (!pidfilename)
-    pidfilename = LOCALSTATEDIR "/run/vped.pid";
-
-  if (!confbase)
-    asprintf (&confbase, "%s/vpe", CONFDIR);
-}
-
 void run_script (const run_script_cb &cb, bool wait)
 {
   int pid;