Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash

[paraslash.git] / audiod_command.c

diff --git a/audiod_command.c b/audiod_command.c
index 524fb57dbd7d81cd5cf96923ab7501bff7f1036e..2d5bb79917b760f117997d42a7752dba6da82da0 100644 (file)
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -426,6 +426,7 @@ int handle_connect(int accept_fd)
        int i, argc, ret, clifd = -1;
        char *cmd = NULL, *p, *buf = para_calloc(MAXLINE), **argv = NULL;
        struct sockaddr_un unix_addr;
+       uid_t uid;
 
        ret = para_accept(accept_fd, &unix_addr, sizeof(struct sockaddr_un));
        if (ret < 0)
@@ -434,8 +435,9 @@ int handle_connect(int accept_fd)
        ret = recv_cred_buffer(clifd, buf, MAXLINE - 1);
        if (ret < 0)
                goto out;
+       uid = ret;
        PARA_INFO_LOG("connection from user %i, buf: %s\n",  ret, buf);
-       ret = check_perms(ret);
+       ret = check_perms(uid);
        if (ret < 0)
                goto out;
        ret = -E_INVALID_AUDIOD_CMD;
@@ -520,6 +522,7 @@ void audiod_status_dump(void)
        old = stat_task->stat_item_values[SI_DECODER_FLAGS];
        new = decoder_flags();
        if (!old || strcmp(old, new)) {
+               free(old);
                stat_client_write(new, SI_DECODER_FLAGS);
                stat_task->stat_item_values[SI_DECODER_FLAGS] = new;
        } else