testing

3 files changed, 8 insertions, 5 deletions

diff --git a/src/include/common.h b/src/include/common.h
index e28870807..f7c8ea725 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -113,5 +113,5 @@ int join_namespace(pid_t pid, char *type);
 int name2pid(const char *name, pid_t *pid);
 char *pid_proc_comm(const pid_t pid);
 char *pid_proc_cmdline(const pid_t pid);
-int pid_proc_cmdline_x11(const pid_t pid);
+int pid_proc_cmdline_x11_xpra_xephyr(const pid_t pid);
 #endif
diff --git a/src/lib/common.c b/src/lib/common.c
index acb6bd3b4..fc4c167ba 100644
--- a/src/lib/common.c
+++ b/src/lib/common.c
@@ -201,7 +201,7 @@ char *pid_proc_cmdline(const pid_t pid) {
 }
 
 // return 1 if firejail --x11 on command line
-int pid_proc_cmdline_x11(const pid_t pid) {
+int pid_proc_cmdline_x11_xpra_xephyr(const pid_t pid) {
         // if comm is not firejail return 0
         char *comm = pid_proc_comm(pid);
         if (strcmp(comm, "firejail") != 0) {
@@ -248,8 +248,11 @@ int pid_proc_cmdline_x11(const pid_t pid) {
                         break;
                 if (strncmp(arg, "--", 2) != 0)
                         break;
-                        
-                // check x11
+                
+                if (strcmp(arg, "--x11=xorg") == 0)
+                        return 0;
+                
+                // check x11 xpra or xephyr
                 if (strncmp(arg, "--x11", 5) == 0)
                         return 1;
                 i += strlen(arg);
diff --git a/src/lib/pid.c b/src/lib/pid.c
index bbb123b81..ef1a428fb 100644
--- a/src/lib/pid.c
+++ b/src/lib/pid.c
@@ -341,7 +341,7 @@ void pid_read(pid_t mon_pid) {
                                 }
 
                                 if ((strncmp(ptr, "firejail", 8) == 0) && (mon_pid == 0 || mon_pid == pid)) {
-                                        if (pid_proc_cmdline_x11(pid))
+                                        if (pid_proc_cmdline_x11_xpra_xephyr(pid))
                                                 pids[pid].level = -1;
                                         else
                                                 pids[pid].level = 1;