X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=1e45eb3616a858091f98f42079d94251963a43ed;hp=6b1e11d6fb580b1edd8da144e3c47b2977fb1d2e;hb=c29457cf28486bc455c437e300bcfd0c7582c605;hpb=7a4b6d5f19976ceac581f6dc235fcbd9b30c767f;ds=sidebyside

diff --git a/server.c b/server.c
index 6b1e11d6..1e45eb36 100644
--- a/server.c
+++ b/server.c
@@ -462,12 +462,6 @@ static int init_afs(void)
 	return afs_server_socket[0];
 }
 
-__noreturn static void tmp_sigchld_handler(__a_unused int s)
-{
-	PARA_EMERG_LOG("caught early SIGCHLD\n");
-	exit(EXIT_FAILURE);
-}
-
 static void server_init(int argc, char **argv)
 {
 	struct server_cmdline_parser_params params = {
@@ -509,14 +503,16 @@ static void server_init(int argc, char **argv)
 	 */
 	para_sigaction(SIGUSR1, SIG_IGN);
 	/*
-	 * We have to install a SIGCHLD handler before the afs process is being
-	 * forked off. Otherwise, para_server does not notice if afs dies before
-	 * the SIGCHLD handler has been installed by init_signal_task() below.
+	 * We have to block SIGCHLD before the afs process is being forked off.
+	 * Otherwise, para_server does not notice if afs dies before the
+	 * SIGCHLD handler has been installed for the parent process by
+	 * init_signal_task() below.
 	 */
-	para_sigaction(SIGCHLD, tmp_sigchld_handler);
+	para_block_signal(SIGCHLD);
 	PARA_NOTICE_LOG("initializing the audio file selector\n");
 	afs_socket = init_afs();
 	init_signal_task();
+	para_unblock_signal(SIGCHLD);
 	PARA_NOTICE_LOG("initializing virtual streaming system\n");
 	init_vss_task(afs_socket);
 	PARA_NOTICE_LOG("server init complete\n");