X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=server.c;h=ae8848b6856732ae7d1d7fb034953f64b682aad1;hb=7d28108f4691e0e7df199fd89f386cafeb3466c7;hp=088cc8b124448123ed6f4cb73f0226f584dffc25;hpb=cf47da359caca907d8f0fd8fe9f5f4ddb398b67d;p=paraslash.git

diff --git a/server.c b/server.c
index 088cc8b1..ae8848b6 100644
--- a/server.c
+++ b/server.c
@@ -457,7 +457,7 @@ static void server_init(int argc, char **argv)
 		.check_ambiguity = 0,
 		.print_errors = 1
 	};
-	int afs_socket;
+	int afs_socket, daemon_pipe = -1;
 
 	valid_fd_012();
 	init_random_seed_or_die();
@@ -477,7 +477,7 @@ static void server_init(int argc, char **argv)
 	init_user_list(user_list_file);
 	/* become daemon */
 	if (conf.daemon_given)
-		daemonize(true /* parent waits for SIGTERM */);
+		daemon_pipe = daemonize(true /* parent waits for us */);
 	PARA_NOTICE_LOG("initializing audio format handlers\n");
 	afh_init();
 
@@ -503,8 +503,13 @@ static void server_init(int argc, char **argv)
 	PARA_NOTICE_LOG("initializing virtual streaming system\n");
 	init_vss_task(afs_socket, &sched);
 	init_server_command_task(argc, argv);
-	if (conf.daemon_given)
-		kill(getppid(), SIGTERM);
+	if (daemon_pipe >= 0) {
+		if (write(daemon_pipe, "\0", 1) < 0) {
+			PARA_EMERG_LOG("daemon_pipe: %s", strerror(errno));
+			exit(EXIT_FAILURE);
+		}
+		close(daemon_pipe);
+	}
 	PARA_NOTICE_LOG("server init complete\n");
 }