firemon fixes

2 files changed, 4 insertions, 5 deletions

diff --git a/src/lib/common.c b/src/lib/common.c
index 885f31881..fe5c62536 100644
--- a/src/lib/common.c
+++ b/src/lib/common.c
@@ -242,7 +242,7 @@ int pid_proc_cmdline_x11(const pid_t pid) {
                 if (i >= len)
                         break;
                 char *arg = buffer + i;
-                
+
                 // detect the last command line option
                 if (strcmp(arg, "--") == 0)
                         break;
@@ -250,8 +250,9 @@ int pid_proc_cmdline_x11(const pid_t pid) {
                         break;
                         
                 // check x11
-                if (strcmp(arg, "--x11") == 0 || strncmp(arg, "--x11=", 6) == 0)
+                if (strncmp(arg, "--x11", 5) == 0)
                         return 1;
+                i += strlen(arg);
         }
         return 0;
 }
diff --git a/src/lib/pid.c b/src/lib/pid.c
index 4540247a0..bbb123b81 100644
--- a/src/lib/pid.c
+++ b/src/lib/pid.c
@@ -341,10 +341,8 @@ 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)) {
-                                                printf("--x11 detected for pid %d\n", pid);
+                                        if (pid_proc_cmdline_x11(pid))
                                                 pids[pid].level = -1;
-                                        }
                                         else
                                                 pids[pid].level = 1;
                                 }