hrev51073 adds 1 changeset to branch 'master'
old head: 99ccb18d974c974f5c609cc964eee59956f7efd1
new head: bc600adbd8c290c9bbfa3cf6e37d5b76ad603287
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=bc600adbd8c2+%5E99ccb18d974c
----------------------------------------------------------------------------
bc600adbd8c2: launch_daemon: Don't allow restarting.
* Check if the port already exists on startup. This fixes #12901.
[ Axel Dörfler <axeld@xxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51073
Commit: bc600adbd8c290c9bbfa3cf6e37d5b76ad603287
URL: http://cgit.haiku-os.org/haiku/commit/?id=bc600adbd8c2
Author: Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>
Date: Fri Apr 7 16:01:14 2017 UTC
Ticket: https://dev.haiku-os.org/ticket/12901
----------------------------------------------------------------------------
1 file changed, 6 insertions(+), 1 deletion(-)
src/servers/launch/LaunchDaemon.cpp | 7 ++++++-
----------------------------------------------------------------------------
diff --git a/src/servers/launch/LaunchDaemon.cpp
b/src/servers/launch/LaunchDaemon.cpp
index 736b471..1d9b76d 100644
--- a/src/servers/launch/LaunchDaemon.cpp
+++ b/src/servers/launch/LaunchDaemon.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2015-2016, Axel Dörfler, axeld@xxxxxxxxxxxxxxxx.
+ * Copyright 2015-2017, Axel Dörfler, axeld@xxxxxxxxxxxxxxxx.
* Distributed under the terms of the MIT License.
*/
@@ -1942,6 +1942,11 @@ open_stdio(int targetFD, int openMode)
int
main()
{
+ if (find_port(B_LAUNCH_DAEMON_PORT_NAME) >= 0) {
+ fprintf(stderr, "The launch_daemon is already running!\n");
+ return EXIT_FAILURE;
+ }
+
// Make stdin/out/err available
open_stdio(STDIN_FILENO, O_RDONLY);
open_stdio(STDOUT_FILENO, O_WRONLY);
