X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=9c06991378512172e95b70165118ae1ea873bdb1;hp=9187b63fa6ae20aa525fa435010f1675b1458b0d;hb=0f1d8e4e182a48d366f06633b797a5dfbbfea407;hpb=e9e6150fdba1687366956d358cc30ad9b0552523

diff --git a/server.c b/server.c
index 9187b63f..9c069913 100644
--- a/server.c
+++ b/server.c
@@ -328,8 +328,6 @@ static void init_signal_task(void)
 		goto err;
 	if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
 		goto err;
-	if (signal(SIGUSR1, SIG_IGN) == SIG_ERR)
-		goto err;
 	add_close_on_fork_list(st->fd);
 	register_task(&st->task);
 	return;
@@ -499,6 +497,18 @@ static void server_init(int argc, char **argv)
 		daemonize();
 	PARA_NOTICE_LOG("initializing audio format handlers\n");
 	afh_init();
+
+	/*
+	 * Although afs uses its own signal handling we must ignore SIGUSR1
+	 * _before_ the afs child process gets born by init_afs() below.  It's
+	 * racy to do this in the child because the parent might send SIGUSR1
+	 * before the child gets a chance to ignore this signal -- only the
+	 * good die young.
+	 */
+	if (signal(SIGUSR1, SIG_IGN) == SIG_ERR) {
+		PARA_EMERG_LOG("failed to ignore SIGUSR1\n");
+		exit(EXIT_FAILURE);
+	}
 	PARA_NOTICE_LOG("initializing the audio file selector\n");
 	afs_socket = init_afs();
 	init_signal_task();