git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
lib
/
daemon.c
diff --git
a/lib/daemon.c
b/lib/daemon.c
index
3c1e5c3
..
98f30d7
100644
(file)
--- a/
lib/daemon.c
+++ b/
lib/daemon.c
@@
-400,7
+400,7
@@
monitor_daemon(pid_t daemon_pid)
char *status_msg;
int crashes;
char *status_msg;
int crashes;
- s
ubprogram_name = "monitor"
;
+ s
et_subprogram_name("monitor")
;
status_msg = xstrdup("healthy");
last_restart = TIME_MIN;
crashes = 0;
status_msg = xstrdup("healthy");
last_restart = TIME_MIN;
crashes = 0;
@@
-470,7
+470,7
@@
monitor_daemon(pid_t daemon_pid)
/* Running in new daemon process. */
proctitle_restore();
/* Running in new daemon process. */
proctitle_restore();
- s
ubprogram_name = ""
;
+ s
et_subprogram_name("")
;
}
/* Close standard file descriptors (except any that the client has requested we
}
/* Close standard file descriptors (except any that the client has requested we
@@
-529,6
+529,8
@@
daemonize_start(void)
/* Running in daemon process. */
}
/* Running in daemon process. */
}
+ forbid_forking("running in daemon process");
+
if (pidfile) {
make_pidfile();
}
if (pidfile) {
make_pidfile();
}