diff options
author | netblue30 <netblue30@yahoo.com> | 2016-09-06 10:13:11 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2016-09-06 10:13:11 -0400 |
commit | fa424ad84d1bcabdc35611fac4b3ca1ebe51e1e1 (patch) | |
tree | 4823ec63e95671de9f60ea2b8dbfad401f0158de | |
parent | todo (diff) | |
download | firejail-fa424ad84d1bcabdc35611fac4b3ca1ebe51e1e1.tar.gz firejail-fa424ad84d1bcabdc35611fac4b3ca1ebe51e1e1.tar.zst firejail-fa424ad84d1bcabdc35611fac4b3ca1ebe51e1e1.zip |
compile cleanup
-rw-r--r-- | src/firecfg/main.c | 2 | ||||
-rw-r--r-- | src/firejail/firejail.h | 4 | ||||
-rw-r--r-- | src/firejail/fs_home.c | 2 | ||||
-rwxr-xr-x | test/compile/compile.sh | 21 |
4 files changed, 28 insertions, 1 deletions
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) { | |||
387 | 387 | ||
388 | // put '\0' at end of filename | 388 | // put '\0' at end of filename |
389 | char *tail = NULL; | 389 | char *tail = NULL; |
390 | char endchar; | 390 | char endchar = ' '; |
391 | if (execname[0] == '/') { | 391 | if (execname[0] == '/') { |
392 | char *ptr2 = index(execname, ' '); | 392 | char *ptr2 = index(execname, ' '); |
393 | char *ptr3 = index(execname, '\n'); | 393 | 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); | |||
478 | void fs_check_private_dir(void); | 478 | void fs_check_private_dir(void); |
479 | // check new private template home directory (--private-template= option) exit if it fails | 479 | // check new private template home directory (--private-template= option) exit if it fails |
480 | void fs_check_private_template(void); | 480 | void fs_check_private_template(void); |
481 | // check directory list specified by user (--private-home option) - exit if it fails | ||
482 | void fs_check_home_list(void); | ||
483 | void fs_private_home_list(void); | ||
484 | |||
481 | 485 | ||
482 | // seccomp.c | 486 | // seccomp.c |
483 | int seccomp_filter_drop(int enforce_seccomp); | 487 | 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; | |||
361 | static char *check_dir_or_file(const char *name); | 361 | static char *check_dir_or_file(const char *name); |
362 | 362 | ||
363 | int fs_copydir(const char *path, const struct stat *st, int ftype, struct FTW *sftw) { | 363 | int fs_copydir(const char *path, const struct stat *st, int ftype, struct FTW *sftw) { |
364 | (void) st; | ||
365 | (void) sftw; | ||
364 | if (size_limit_reached) | 366 | if (size_limit_reached) |
365 | return 0; | 367 | return 0; |
366 | 368 | ||
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" | |||
14 | arr[12]="TEST 12: compile apparmor" | 14 | arr[12]="TEST 12: compile apparmor" |
15 | arr[13]="TEST 13: compile busybox" | 15 | arr[13]="TEST 13: compile busybox" |
16 | arr[14]="TEST 14: compile overlayfs disabled" | 16 | arr[14]="TEST 14: compile overlayfs disabled" |
17 | arr[15]="TEST 15: compile apparmor enabled" | ||
17 | 18 | ||
18 | # remove previous reports and output file | 19 | # remove previous reports and output file |
19 | cleanup() { | 20 | cleanup() { |
@@ -307,6 +308,24 @@ cp output-configure oc14 | |||
307 | cp output-make om14 | 308 | cp output-make om14 |
308 | rm output-configure output-make | 309 | rm output-configure output-make |
309 | 310 | ||
311 | #***************************************************************** | ||
312 | # TEST 15 | ||
313 | #***************************************************************** | ||
314 | # - enable apparmor | ||
315 | #***************************************************************** | ||
316 | print_title "${arr[15]}" | ||
317 | # seccomp | ||
318 | cd firejail | ||
319 | make distclean | ||
320 | ./configure --prefix=/usr --enable-apparmor --enable-fatal-warnings 2>&1 | tee ../output-configure | ||
321 | make -j4 2>&1 | tee ../output-make | ||
322 | cd .. | ||
323 | grep Warning output-configure output-make > ./report-test15 | ||
324 | grep Error output-configure output-make >> ./report-test15 | ||
325 | cp output-configure oc15 | ||
326 | cp output-make om15 | ||
327 | rm output-configure output-make | ||
328 | |||
310 | 329 | ||
311 | #***************************************************************** | 330 | #***************************************************************** |
312 | # PRINT REPORTS | 331 | # PRINT REPORTS |
@@ -336,3 +355,5 @@ echo ${arr[11]} | |||
336 | echo ${arr[12]} | 355 | echo ${arr[12]} |
337 | echo ${arr[13]} | 356 | echo ${arr[13]} |
338 | echo ${arr[14]} | 357 | echo ${arr[14]} |
358 | echo ${arr[15]} | ||
359 | |||