X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=7da05898b69b528563fc0e902f0568c0728752a8;hp=5ea8811f960550c26d9b99a2c0a15b9ac204f7f7;hb=b17c70f1f96ca624064dd5202c54be55ed4d71c6;hpb=9902762e74e41165dfa18606411cef86ac7afd5d

diff --git a/server.c b/server.c
index 5ea8811f..7da05898 100644
--- a/server.c
+++ b/server.c
@@ -115,7 +115,6 @@ static FILE *logfile;
 /** The file containing user information (public key, permissions). */
 static char *user_list_file = NULL;
 static int mmd_shm_id;
-static pid_t afs_pid;
 
 
 /** The task responsible for server command handling. */
@@ -260,8 +259,8 @@ static void handle_sighup(void)
 	logfile = NULL;
 	parse_config(1); /* reopens log */
 	init_user_list(user_list_file); /* reload user list */
-	if (afs_pid)
-		kill(afs_pid, SIGHUP);
+	if (mmd->afs_pid)
+		kill(mmd->afs_pid, SIGHUP);
 }
 
 static void signal_post_select(struct sched *s, struct task *t)
@@ -282,7 +281,7 @@ static void signal_post_select(struct sched *s, struct task *t)
 			int ret = para_reap_child(&pid);
 			if (ret <= 0)
 				break;
-			if (pid != afs_pid)
+			if (pid != mmd->afs_pid)
 				continue;
 			PARA_EMERG_LOG("fatal: afs died\n");
 			goto genocide;
@@ -448,10 +447,10 @@ static int init_afs(void)
 	if (ret < 0)
 		exit(EXIT_FAILURE);
 	afs_socket_cookie = para_random((uint32_t)-1);
-	afs_pid = fork();
-	if (afs_pid < 0)
+	mmd->afs_pid = fork();
+	if (mmd->afs_pid < 0)
 		exit(EXIT_FAILURE);
-	if (!afs_pid) { /* child (afs) */
+	if (!mmd->afs_pid) { /* child (afs) */
 		close(afs_server_socket[0]);
 		afs_init(afs_socket_cookie, afs_server_socket[1]);
 	}
@@ -493,7 +492,6 @@ static void server_init(int argc, char **argv)
 		daemon_init();
 	PARA_NOTICE_LOG("initializing audio format handlers\n");
 	afh_init();
-	mmd->server_pid = getpid();
 	init_signal_task();
 	PARA_NOTICE_LOG("initializing the audio file selector\n");
 	afs_socket = init_afs();