X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=0fe2e5f05edd39e18ed8aac3d0191daec9196026;hp=b847e5aa264fa4ccb9e8c9aafcfcb61713ae2131;hb=16c6fc10f3344e3eec66e51580821d854d49aa62;hpb=1a8e3628040a94a8c06027335962a6cb2f827a63

diff --git a/audiod_command.c b/audiod_command.c
index b847e5aa..0fe2e5f0 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -16,6 +16,7 @@
 
 #include "para.h"
 #include "audiod.cmdline.h"
+#include "audiod.command_list.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
@@ -30,11 +31,22 @@
 #include "write.h"
 #include "fd.h"
 #include "version.h"
-#include "audiod.command_list.h"
 
 extern struct sched sched;
 extern char *stat_item_values[NUM_STAT_ITEMS];
 
+/* Defines one command of para_audiod. */
+struct audiod_command {
+	const char *name;
+	/* Pointer to the function that handles the command. */
+	int (*handler)(int, int, char **);
+	/* One-line description. */
+	const char *description;
+	/* Summary of the command line options. */
+	const char *usage;
+	/* The long help text. */
+	const char *help;
+};
 
 static struct audiod_command audiod_cmds[] = {DEFINE_AUDIOD_CMD_ARRAY};
 
@@ -278,6 +290,7 @@ static int com_tasks(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	char *tl = get_task_list(&sched);
 	int ret = 1;
+
 	if (tl)
 		ret = client_write(fd, tl);
 	free(tl);
@@ -396,14 +409,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;
 }
@@ -413,6 +426,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,
@@ -425,7 +439,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;
@@ -440,7 +454,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);