stream: New functions stream_verify_name() and pstream_verify_name().

[openvswitch] / lib / daemon.c

diff --git a/lib/daemon.c b/lib/daemon.c
index 140e0f725f9bf84a32b472a178ae65eccc1ad9c2..081912b128c230c59550608059ea4cdc9a8b25a0 100644 (file)
--- a/lib/daemon.c
+++ b/lib/daemon.c
@@ -58,9 +58,9 @@ static bool monitor;
 char *
 make_pidfile_name(const char *name) 
 {
-    return (!name ? xasprintf("%s/%s.pid", ovs_rundir, program_name)
-            : *name == '/' ? xstrdup(name)
-            : xasprintf("%s/%s", ovs_rundir, name));
+    return (!name
+            ? xasprintf("%s/%s.pid", ovs_rundir, program_name)
+            : abs_file_name(ovs_rundir, name));
 }
 
 /* Sets up a following call to daemonize() to create a pidfile named 'name'.
@@ -364,6 +364,7 @@ monitor_daemon(pid_t daemon_pid)
             }
         }
     }
+    free(status_msg);
 
     /* Running in new daemon process. */
     proctitle_restore();