summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wtaymans@redhat.com>2019-06-19 16:26:55 +0200
committerWim Taymans <wtaymans@redhat.com>2019-06-19 16:26:55 +0200
commita7e432eac182def74571a4e66f85d0cb1ab14539 (patch)
tree88d7be443698b852b10f6002260573f823b8b7cd
parent1b259f746c9ad2a8155230bf733b40391ce071b8 (diff)
Revert "global: combine all permissions of the object tree"fedora-30
-rw-r--r--src/pipewire/global.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/pipewire/global.c b/src/pipewire/global.c
index c963965e..00258ff8 100644
--- a/src/pipewire/global.c
+++ b/src/pipewire/global.c
@@ -38,15 +38,9 @@ uint32_t pw_global_get_permissions(struct pw_global *global, struct pw_client *c
{
uint32_t perms = PW_PERM_RWX;
- if (client->permission_func == NULL)
- return perms;
-
- perms = client->permission_func(global, client, client->permission_data);
-
- while (global != global->parent) {
- global = global->parent;
+ if (client->permission_func != NULL)
perms &= client->permission_func(global, client, client->permission_data);
- }
+
return perms;
}