aboutsummaryrefslogtreecommitdiffstats
path: root/src/firejail/util.c
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2020-08-22 13:30:51 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2020-08-22 13:30:51 -0400
commitdbab21a0187b558dd570754e914e47bc77929be8 (patch)
treefe53485c769ebe88b74705a77abc8e79e0a0a649 /src/firejail/util.c
parentfiremon fix for xdg-bus-proxy (diff)
downloadfirejail-dbab21a0187b558dd570754e914e47bc77929be8.tar.gz
firejail-dbab21a0187b558dd570754e914e47bc77929be8.tar.zst
firejail-dbab21a0187b558dd570754e914e47bc77929be8.zip
fix --join for sandboxes with xdg-dbuss-proxy
Diffstat (limited to 'src/firejail/util.c')
-rw-r--r--src/firejail/util.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/firejail/util.c b/src/firejail/util.c
index d65ac0071..9f878611a 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -647,8 +647,13 @@ int find_child(pid_t parent, pid_t *child) {
647 fprintf(stderr, "Error: cannot read /proc file\n"); 647 fprintf(stderr, "Error: cannot read /proc file\n");
648 exit(1); 648 exit(1);
649 } 649 }
650 if (parent == atoi(ptr)) 650 if (parent == atoi(ptr)) {
651 *child = pid; 651 // we don't want /usr/bin/xdg-dbus-proxy!
652 char *cmdline = pid_proc_cmdline(pid);
653 if (strncmp(cmdline, XDG_DBUS_PROXY_PATH, strlen(XDG_DBUS_PROXY_PATH)) != 0)
654 *child = pid;
655 free(cmdline);
656 }
652 break; // stop reading the file 657 break; // stop reading the file
653 } 658 }
654 } 659 }