From 53fd3c71ab5598e7b57d7682248eab8a743c0026 Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Thu, 27 Aug 2015 14:52:51 -0400
Subject: cleanup

---
 src/firejail/main.c       | 3 ++-
 src/firejail/no_sandbox.c | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/firejail/main.c b/src/firejail/main.c
index e02cf6215..91a8380f3 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -998,7 +998,8 @@ int main(int argc, char **argv) {
 	}
 
 	// if a sandbox is already running, start the program directly without sandboxing
-	if (check_kernel_procs() == 0) {
+	int rv = check_kernel_procs();
+	if (rv) {
 		run_no_sandbox(argc, argv);
 		// it will never get here!
 		assert(0);
diff --git a/src/firejail/no_sandbox.c b/src/firejail/no_sandbox.c
index 5603974aa..04666a69f 100644
--- a/src/firejail/no_sandbox.c
+++ b/src/firejail/no_sandbox.c
@@ -36,6 +36,9 @@ int check_kernel_procs(void) {
 	};
 	int i;
 
+	if (arg_debug)
+		printf("Looking for kernel processes\n");
+
 	// look at the first 10 processes
 	// if a kernel process is found, return 1
 	for (i = 1; i <= 10; i++) { 
@@ -73,6 +76,8 @@ int check_kernel_procs(void) {
 		int j = 0;
 		while (kern_proc[j] != NULL) {
 			if (strncmp(buf, kern_proc[j], strlen(kern_proc[j])) == 0) {
+				if (arg_debug)
+					printf("Found %s process, we are not running in a sandbox\n", buf);
 				fclose(fp);
 				free(fname);
 				return 1;
@@ -84,6 +89,9 @@ int check_kernel_procs(void) {
 		free(fname);
 	}
 
+	if (arg_debug)
+		printf("No kernel processes found, we are already running in a sandbox\n");
+
 	return 0;
 }
 
-- 
cgit v1.2.3-54-g00ecf