mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-01 22:58:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove configurable client access group, since can never work on Linux anway, since SCM_CREDENTAILS doesn't allow sending supplementary GIDs

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1127 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-07-20 21:28:44 +00:00
parent dd5fd8d703
commit da1ec271bb
3 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/pulse/client-conf.c
View file

@ -64,7 +64,6 @@ static const pa_client_conf default_conf = {
.autospawn = 0,
.cookie_file = NULL,
.cookie_valid = 0,
.access_group = NULL
};
pa_client_conf *pa_client_conf_new(void) {
@ -73,7 +72,6 @@ pa_client_conf *pa_client_conf_new(void) {
c->daemon_binary = pa_xstrdup(PA_BINARY);
c->extra_arguments = pa_xstrdup("--log-target=syslog --exit-idle-time=5");
c->cookie_file = pa_xstrdup(PA_NATIVE_COOKIE_FILE);
c->access_group = pa_xstrdup(PA_ACCESS_GROUP);
return c;
}
@ -86,7 +84,6 @@ void pa_client_conf_free(pa_client_conf *c) {
pa_xfree(c->default_source);
pa_xfree(c->default_server);
pa_xfree(c->cookie_file);
pa_xfree(c->access_group);
pa_xfree(c);
}
int pa_client_conf_load(pa_client_conf *c, const char *filename) {
@ -103,7 +100,6 @@ int pa_client_conf_load(pa_client_conf *c, const char *filename) {
{ "default-server", pa_config_parse_string, NULL },
{ "autospawn", pa_config_parse_bool, NULL },
{ "cookie-file", pa_config_parse_string, NULL },
{ "access-group", pa_config_parse_string, NULL },
{ NULL, NULL, NULL },
};
@ -114,7 +110,6 @@ int pa_client_conf_load(pa_client_conf *c, const char *filename) {
table[4].data = &c->default_server;
table[5].data = &c->autospawn;
table[6].data = &c->cookie_file;
table[7].data = &c->access_group;
f = filename ?
fopen((fn = pa_xstrdup(filename)), "r") :

2
src/pulse/client-conf.h
View file

@ -27,7 +27,7 @@
/* A structure containing configuration data for PulseAudio clients. */
typedef struct pa_client_conf {
char *daemon_binary, *extra_arguments, *default_sink, *default_source, *default_server, *cookie_file, *access_group;
char *daemon_binary, *extra_arguments, *default_sink, *default_source, *default_server, *cookie_file;
int autospawn;
uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
int cookie_valid; /* non-zero, when cookie is valid */

5
src/pulse/context.c
View file

@ -428,15 +428,10 @@ static void setup_context(pa_context *c, pa_iochannel *io) {
#ifdef HAVE_CREDS
{
pa_creds ucred;
gid_t g;
ucred.uid = getuid();
ucred.gid = getgid();
if ((g = pa_get_gid_of_group(c->conf->access_group)) != (gid_t) -1)
if (pa_check_in_group(g) > 0)
ucred.gid = g;
pa_pstream_send_tagstruct_with_creds(c->pstream, t, &ucred);
}
#else