X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=1e45eb3616a858091f98f42079d94251963a43ed;hp=15ae5c9a296be654471fd1f95aa9395629fae097;hb=a7a72ca4acf7f44abca866d410e2bc80590e7fab;hpb=c5670af5c1f784fe6c3d46d0281f2ba7c47af75e

diff --git a/server.c b/server.c
index 15ae5c9a..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 = {
@@ -493,6 +487,7 @@ static void server_init(int argc, char **argv)
 	gettimeofday(now, NULL);
 	set_server_start_time(now);
 	init_user_list(user_list_file);
+	init_server_command_task(argc, argv);
 	/* become daemon */
 	if (conf.daemon_given)
 		daemonize();
@@ -508,17 +503,18 @@ 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);
-	init_server_command_task(argc, argv);
 	PARA_NOTICE_LOG("server init complete\n");
 }