X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod_command.c;h=5c7d2d53937df19706952ecce185246711be615a;hb=cb193b91d68778125739fe129d49f3c5f4abf999;hp=d5c53bf90059101cd345254e0a3c294c3df73307;hpb=4d9d588c5df359c3c5f279fbfd4ea51d3a2afc87;p=paraslash.git

diff --git a/audiod_command.c b/audiod_command.c
index d5c53bf9..5c7d2d53 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2014 Andre Noll <maan@tuebingen.mpg.de>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -30,7 +30,7 @@
 #include "write.h"
 #include "fd.h"
 #include "version.h"
-#include "audiod_command_list.h"
+#include "audiod.command_list.h"
 
 extern struct sched sched;
 extern char *stat_item_values[NUM_STAT_ITEMS];
@@ -376,10 +376,10 @@ static int com_grab(int fd, int argc, char **argv)
 	return grab_client_new(fd, argc, argv, &sched);
 }
 
-__noreturn static int com_term(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_term(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	close(fd);
-	clean_exit(EXIT_SUCCESS, "terminating on user request");
+	return -E_AUDIOD_TERM;
 }
 
 static int com_on(int fd, __a_unused int argc, __a_unused char **argv)
@@ -436,14 +436,14 @@ static int com_version(int fd, int argc, char **argv)
 	return ret;
 }
 
-static int check_perms(uid_t uid)
+static int check_perms(uid_t uid, uid_t *whitelist)
 {
 	int i;
 
 	if (!conf.user_allow_given)
 		return 1;
 	for (i = 0; i < conf.user_allow_given; i++)
-		if (uid == conf.user_allow_arg[i])
+		if (uid == whitelist[i])
 			return 1;
 	return -E_UCRED_PERM;
 }
@@ -453,6 +453,7 @@ static int check_perms(uid_t uid)
  *
  * \param accept_fd The fd to accept connections on.
  * \param rfds If \a accept_fd is not set in \a rfds, do nothing.
+ * \param uid_whitelist Array of UIDs which are allowed to connect.
  *
  * This is called in each iteration of the select loop. If there is an incoming
  * connection on \a accept_fd, this function reads the command sent by the peer,
@@ -465,7 +466,7 @@ static int check_perms(uid_t uid)
  *
  * \sa para_accept(), recv_cred_buffer()
  * */
-int handle_connect(int accept_fd, fd_set *rfds)
+int handle_connect(int accept_fd, fd_set *rfds, uid_t *uid_whitelist)
 {
 	int i, argc, ret, clifd;
 	char buf[MAXLINE], **argv = NULL;
@@ -480,7 +481,7 @@ int handle_connect(int accept_fd, fd_set *rfds)
 		goto out;
 	uid = ret;
 	PARA_INFO_LOG("connection from user %i, buf: %s\n",  ret, buf);
-	ret = check_perms(uid);
+	ret = check_perms(uid, uid_whitelist);
 	if (ret < 0)
 		goto out;
 	ret = create_argv(buf, "\n", &argv);