X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=3fe654a73c1f71004baf554996df82d100f83933;hp=8f246ba53a04bad687af14d428bec276c822f001;hb=cb193b91d68778125739fe129d49f3c5f4abf999;hpb=218a175db8e7a43cad9073770ebdb24a7bdc64e8

diff --git a/audiod.c b/audiod.c
index 8f246ba5..3fe654a7 100644
--- a/audiod.c
+++ b/audiod.c
@@ -14,6 +14,7 @@
 #include <sys/un.h>
 #include <netdb.h>
 #include <signal.h>
+#include <pwd.h>
 
 #include "para.h"
 #include "error.h"
@@ -148,6 +149,8 @@ static struct signal_task *signal_task;
 
 static struct status_task status_task_struct;
 
+static uid_t *uid_whitelist;
+
 /**
  * the task that calls the status command of para_server
  *
@@ -320,7 +323,7 @@ empty:
 
 static void parse_config_or_die(void)
 {
-	int ret;
+	int ret, i;
 	char *config_file;
 	struct audiod_cmdline_parser_params params = {
 		.override = 0,
@@ -340,6 +343,7 @@ static void parse_config_or_die(void)
 	ret = file_exists(config_file);
 	if (conf.config_file_given && !ret) {
 		PARA_EMERG_LOG("can not read config file %s\n", config_file);
+		free(config_file);
 		goto err;
 	}
 	if (ret) {
@@ -347,9 +351,29 @@ static void parse_config_or_die(void)
 		daemon_set_loglevel(conf.loglevel_arg);
 	}
 	free(config_file);
+	if (conf.user_allow_given > 0) {
+		uid_whitelist = para_malloc(conf.user_allow_given
+			* sizeof(uid_t));
+		for (i = 0; i < conf.user_allow_given; i++) {
+			int32_t val;
+			struct passwd *pw;
+			ret = para_atoi32(conf.user_allow_arg[i], &val);
+			if (ret >= 0) {
+				uid_whitelist[i] = val;
+				continue;
+			}
+			errno = 0; /* see getpwnam(3) */
+			pw = getpwnam(conf.user_allow_arg[i]);
+			if (!pw) {
+				PARA_EMERG_LOG("invalid username: %s\n",
+					conf.user_allow_arg[i]);
+				goto err;
+			}
+			uid_whitelist[i] = pw->pw_uid;
+		}
+	}
 	return;
 err:
-	free(config_file);
 	exit(EXIT_FAILURE);
 }
 
@@ -1029,7 +1053,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);
+		ret = handle_connect(ct->fd[i], &s->rfds, uid_whitelist);
 		if (ret < 0) {
 			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 			if (ret == -E_AUDIOD_TERM) {
@@ -1156,6 +1180,7 @@ static void audiod_cleanup(void)
 	close_unused_slots();
 	audiod_cmdline_parser_free(&conf);
 	close_stat_clients();
+	free(uid_whitelist);
 }
 
 /*