From fa424ad84d1bcabdc35611fac4b3ca1ebe51e1e1 Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Tue, 6 Sep 2016 10:13:11 -0400
Subject: compile cleanup

---
 src/firecfg/main.c      |  2 +-
 src/firejail/firejail.h |  4 ++++
 src/firejail/fs_home.c  |  2 ++
 test/compile/compile.sh | 21 +++++++++++++++++++++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/firecfg/main.c b/src/firecfg/main.c
index 3f9285776..d2566ce22 100644
--- a/src/firecfg/main.c
+++ b/src/firecfg/main.c
@@ -387,7 +387,7 @@ static void fix_desktop_files(void) {
 
 		// put '\0' at end of filename
 		char *tail = NULL;
-		char endchar;
+		char endchar = ' ';
 		if (execname[0] == '/') {
 			char *ptr2 = index(execname, ' ');
 			char *ptr3 = index(execname, '\n');
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index 9b60d40c2..cb8070ae6 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -478,6 +478,10 @@ void fs_private_template(void);
 void fs_check_private_dir(void);
 // check new private template home directory (--private-template= option) exit if it fails
 void fs_check_private_template(void);
+// check directory list specified by user (--private-home option) - exit if it fails
+void fs_check_home_list(void);
+void fs_private_home_list(void);
+
 
 // seccomp.c
 int seccomp_filter_drop(int enforce_seccomp);
diff --git a/src/firejail/fs_home.c b/src/firejail/fs_home.c
index a4b2ec046..064340613 100644
--- a/src/firejail/fs_home.c
+++ b/src/firejail/fs_home.c
@@ -361,6 +361,8 @@ static unsigned size_cnt = 0;
 static char *check_dir_or_file(const char *name);
 
 int fs_copydir(const char *path, const struct stat *st, int ftype, struct FTW *sftw) {
+	(void) st;
+	(void) sftw;
 	if (size_limit_reached)
 		return 0;
 
diff --git a/test/compile/compile.sh b/test/compile/compile.sh
index 76a7162b7..44e67fe22 100755
--- a/test/compile/compile.sh
+++ b/test/compile/compile.sh
@@ -14,6 +14,7 @@ arr[11]="TEST 11: compile disable global config"
 arr[12]="TEST 12: compile apparmor"
 arr[13]="TEST 13: compile busybox"
 arr[14]="TEST 14: compile overlayfs disabled"
+arr[15]="TEST 15: compile apparmor enabled"
 
 # remove previous reports and output file
 cleanup() {
@@ -307,6 +308,24 @@ cp output-configure oc14
 cp output-make om14
 rm output-configure output-make
 
+#*****************************************************************
+# TEST 15
+#*****************************************************************
+# - enable apparmor
+#*****************************************************************
+print_title "${arr[15]}"
+# seccomp
+cd firejail
+make distclean
+./configure --prefix=/usr --enable-apparmor --enable-fatal-warnings 2>&1 | tee ../output-configure
+make -j4 2>&1 | tee ../output-make
+cd ..
+grep Warning output-configure output-make > ./report-test15
+grep Error output-configure output-make >> ./report-test15
+cp output-configure oc15
+cp output-make om15
+rm output-configure output-make
+
 
 #*****************************************************************
 # PRINT REPORTS
@@ -336,3 +355,5 @@ echo ${arr[11]}
 echo ${arr[12]}
 echo ${arr[13]}
 echo ${arr[14]}
+echo ${arr[15]}
+
-- 
cgit v1.2.3-54-g00ecf