X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=bd97f15e22e1629e8b9b0895420438dd5fb46194;hp=5909859be6384604513185afebbe35e7152e27be;hb=121015ff5cdbe6af7b84f6245ebe62fe2a52a859;hpb=3fd8d0567ae654aed7e97e832568d3e1b98e20a2

diff --git a/audiod.c b/audiod.c
index 5909859b..bd97f15e 100644
--- a/audiod.c
+++ b/audiod.c
@@ -164,7 +164,7 @@ int audiod_status = AUDIOD_ON;
  * the gengetopt args_info struct that holds information on all command line
  * arguments
  */
-struct audiod_args_info conf;
+static struct audiod_args_info conf;
 
 static char *socket_name;
 static struct audio_format_info afi[NUM_AUDIO_FORMATS];
@@ -596,7 +596,8 @@ static void open_filters(struct slot_info *s)
 			EMBRACE(.name = f->name, .parent = parent,
 				.handler = f->execute, .context = fn));
 
-		f->open(fn);
+		if (f->open)
+			f->open(fn);
 		sprintf(buf, "%s (slot %d)", f->name, (int)(s - slot));
 		fn->task = task_register(&(struct task_info) {
 			.name = buf,
@@ -763,7 +764,7 @@ static void compute_time_diff(const struct timeval *status_time)
 	if (count > 5) {
 		int s = tv_diff(&diff, &stat_task->sa_time_diff, &tmp);
 		if (tv_diff(&max_deviation, &tmp, NULL) < 0)
-			PARA_WARNING_LOG("time diff jump: %lims\n",
+			PARA_WARNING_LOG("time diff jump: %lums\n",
 				s * tv2ms(&tmp));
 	}
 	count++;
@@ -1072,7 +1073,7 @@ static void init_local_sockets(struct command_task *ct)
 		unlink(socket_name);
 	ct->fd[0] = create_local_socket(socket_name, 0);
 	ct->fd[1] = create_local_socket(socket_name,
-		S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
+		S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
 	if (ct->fd[0] >= 0 || ct->fd[1] >= 0)
 		return;
 	PARA_EMERG_LOG("%s\n", para_strerror(-ct->fd[1]));
@@ -1123,7 +1124,7 @@ static int command_post_select(struct sched *s, void *context)
 	for (i = 0; i < 2; i++) {
 		if (ct->fd[i] < 0)
 			continue;
-		ret = handle_connect(ct->fd[i], &s->rfds, uid_whitelist);
+		ret = handle_connect(ct->fd[i], &s->rfds);
 		if (ret < 0) {
 			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 			if (ret == -E_AUDIOD_TERM) {
@@ -1377,7 +1378,7 @@ static int status_post_select(struct sched *s, void *context)
 	if (st->clock_diff_count) { /* get status only one time */
 		char *argv[] = {"audiod", "--", "stat", "-p", "-n=1", NULL};
 		int argc = 5;
-		PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count);
+		PARA_INFO_LOG("clock diff count: %u\n", st->clock_diff_count);
 		st->clock_diff_count--;
 		client_open(argc, argv, &st->ct, NULL, NULL, st->btrn, s);
 		set_stat_task_restart_barrier(2);
@@ -1448,6 +1449,29 @@ __noreturn static void print_help_and_die(void)
 	exit(0);
 }
 
+/**
+ * Lookup the given UID in the whitelist.
+ *
+ * The whitelist is the array of arguments to the --user-allow opion. If the
+ * option was not given, the array is empty, in which case the check succeeds.
+ *
+ * \param uid User ID to look up.
+ *
+ * \return True if --user-allow was not given, or if uid matches an element of
+ * the whitelist.
+ */
+bool uid_is_whitelisted(uid_t uid)
+{
+	int i;
+
+	if (!conf.user_allow_given)
+		return true;
+	for (i = 0; i < conf.user_allow_given; i++)
+		if (uid == uid_whitelist[i])
+			return true;
+	return false;
+}
+
 /**
  * the main function of para_audiod
  *
@@ -1483,8 +1507,11 @@ int main(int argc, char *argv[])
 	daemon_set_priority(conf.priority_arg);
 	daemon_drop_privileges_or_die(conf.user_arg, conf.group_arg);
 	parse_config_or_die();
-	daemon_init_colors_or_die(conf.color_arg, color_arg_auto, color_arg_no,
-		conf.logfile_given, conf.log_color_arg, conf.log_color_given);
+	if (daemon_init_colors_or_die(conf.color_arg, color_arg_auto, color_arg_no,
+		conf.logfile_given)) {
+			for (i = 0; i < conf.log_color_given; i++)
+				daemon_set_log_color_or_die(conf.log_color_arg[i]);
+	}
 	init_random_seed_or_die();
 	daemon_set_flag(DF_LOG_TIME);
 	daemon_set_flag(DF_LOG_HOSTNAME);