X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=3a39027523a72c686d997d1b358912dc5dfd2363;hp=278e6ef69e9f38a081aea8637405de8fcdc6e600;hb=698178774b857a8959fe70e360ae6ff755eacf8e;hpb=74322f0fab30777d8e34486fce1d81d4bc1106a0

diff --git a/audiod_command.c b/audiod_command.c
index 278e6ef6..3a390275 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -404,24 +404,11 @@ static int com_version(int fd, int argc, char **argv)
 	return ret < 0? ret : 0;
 }
 
-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 == whitelist[i])
-			return 1;
-	return -E_UCRED_PERM;
-}
-
 /**
  * Handle arriving connections on the local socket.
  *
  * \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,
@@ -434,7 +421,7 @@ static int check_perms(uid_t uid, uid_t *whitelist)
  *
  * \sa para_accept(), recv_cred_buffer()
  * */
-int handle_connect(int accept_fd, fd_set *rfds, uid_t *uid_whitelist)
+int handle_connect(int accept_fd, fd_set *rfds)
 {
 	int i, argc, ret, clifd;
 	char buf[MAXLINE], **argv = NULL;
@@ -448,9 +435,9 @@ int handle_connect(int accept_fd, fd_set *rfds, uid_t *uid_whitelist)
 	if (ret < 0)
 		goto out;
 	uid = ret;
-	PARA_INFO_LOG("connection from user %i, buf: %s\n", ret, buf);
-	ret = check_perms(uid, uid_whitelist);
-	if (ret < 0)
+	PARA_INFO_LOG("connection from UID %d, buf: %s\n", ret, buf);
+	ret = -E_UCRED_PERM;
+	if (!uid_is_whitelisted(uid))
 		goto out;
 	ret = create_argv(buf, "\n", &argv);
 	if (ret <= 0)