remove configurable client access group, since can never work on Linux anway, since...

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1127 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c
index 219175973f0508e4d32ec629da02fbe4bd66b302..c3f58ec2489cadd2e5881941db55c3cbce2c0a6a 100644 (file)
--- a/src/pulse/client-conf.c
+++ b/src/pulse/client-conf.c
@@ -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") :

diff --git a/src/pulse/client-conf.h b/src/pulse/client-conf.h
index dfb1148dc380ef417026168e17de990997dff5cc..a532f0dfec5e1c98236999a43935d284f33a5ef9 100644 (file)
--- a/src/pulse/client-conf.h
+++ b/src/pulse/client-conf.h
@@ -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 */

diff --git a/src/pulse/context.c b/src/pulse/context.c
index 30a257fe6be75248b28af63d2358a7925f971940..34f517f0b7554ff9a6bb9a3eaa16e54ba4a381f1 100644 (file)
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -428,14 +428,9 @@ 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);
 }