X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=aa8fdda5425dae48dc6b47a8009795603bbefcd3;hp=73986f6df3bf00d080bd7b9e2f12f4efa2e9a5f1;hb=5b8e525dfb2f18a4e0d67b9da264259159ad2184;hpb=c73d23911d78ed10179c12ef8f79a3fcf3bbcdaf

diff --git a/server.c b/server.c
index 73986f6d..aa8fdda5 100644
--- a/server.c
+++ b/server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -51,6 +51,7 @@
  *	- The object storage layer: \ref osl.c,
  *	- Blob tables: \ref blob.c,
  *	- The error subssystem: \ref error.h.
+ *	- Access control for paraslash senders: \ref acl.c, \ref acl.h.
  *
  * Low-level data structures:
  *
@@ -76,12 +77,12 @@
 #include "vss.h"
 #include "config.h"
 #include "close_on_fork.h"
+#include "list.h"
 #include "send.h"
 #include "net.h"
 #include "daemon.h"
 #include "ipc.h"
 #include "fd.h"
-#include "list.h"
 #include "sched.h"
 #include "signal.h"
 #include "user_list.h"
@@ -398,11 +399,11 @@ static unsigned server_init(int argc, char **argv)
 	PARA_NOTICE_LOG("initializing audio format handlers\n");
 	afh_init();
 	PARA_NOTICE_LOG("initializing virtual streaming system\n");
-	vss_init();
 	mmd->server_pid = getpid();
 	setup_signal_handling();
 	PARA_NOTICE_LOG("initializing the audio file selector\n");
 	init_afs();
+	vss_init();
 	mmd_lock();
 	/* init network socket */
 	PARA_NOTICE_LOG("initializing tcp command socket\n");
@@ -479,8 +480,6 @@ repeat:
 	timeout = vss_preselect(&rfds, &wfds, &max_fileno);
 	status_refresh();
 	for (i = 0; senders[i].name; i++) {
-		if (senders[i].status != SENDER_ON)
-			continue;
 		if (!senders[i].pre_select)
 			continue;
 		senders[i].pre_select(&max_fileno, &rfds, &wfds);
@@ -492,8 +491,6 @@ repeat:
 	if (ret < 0)
 		goto repeat;
 	for (i = 0; senders[i].name; i++) {
-		if (senders[i].status != SENDER_ON)
-			continue;
 		if (!senders[i].post_select)
 			continue;
 		senders[i].post_select(&rfds, &wfds);