diff options
-rwxr-xr-x | configure | 18 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/firejail/fs_bin.c | 2 | ||||
-rwxr-xr-x | test/configure | 2 | ||||
-rwxr-xr-x | test/test-root.sh | 8 |
5 files changed, 16 insertions, 16 deletions
@@ -1,6 +1,6 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
3 | # Generated by GNU Autoconf 2.69 for firejail 0.9.40~rc2. | 3 | # Generated by GNU Autoconf 2.69 for firejail 0.9.40. |
4 | # | 4 | # |
5 | # Report bugs to <netblue30@yahoo.com>. | 5 | # Report bugs to <netblue30@yahoo.com>. |
6 | # | 6 | # |
@@ -580,8 +580,8 @@ MAKEFLAGS= | |||
580 | # Identity of this package. | 580 | # Identity of this package. |
581 | PACKAGE_NAME='firejail' | 581 | PACKAGE_NAME='firejail' |
582 | PACKAGE_TARNAME='firejail' | 582 | PACKAGE_TARNAME='firejail' |
583 | PACKAGE_VERSION='0.9.40~rc2' | 583 | PACKAGE_VERSION='0.9.40' |
584 | PACKAGE_STRING='firejail 0.9.40~rc2' | 584 | PACKAGE_STRING='firejail 0.9.40' |
585 | PACKAGE_BUGREPORT='netblue30@yahoo.com' | 585 | PACKAGE_BUGREPORT='netblue30@yahoo.com' |
586 | PACKAGE_URL='http://firejail.wordpress.com' | 586 | PACKAGE_URL='http://firejail.wordpress.com' |
587 | 587 | ||
@@ -1246,7 +1246,7 @@ if test "$ac_init_help" = "long"; then | |||
1246 | # Omit some internal or obsolete options to make the list less imposing. | 1246 | # Omit some internal or obsolete options to make the list less imposing. |
1247 | # This message is too long to be a string in the A/UX 3.1 sh. | 1247 | # This message is too long to be a string in the A/UX 3.1 sh. |
1248 | cat <<_ACEOF | 1248 | cat <<_ACEOF |
1249 | \`configure' configures firejail 0.9.40~rc2 to adapt to many kinds of systems. | 1249 | \`configure' configures firejail 0.9.40 to adapt to many kinds of systems. |
1250 | 1250 | ||
1251 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1251 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1252 | 1252 | ||
@@ -1307,7 +1307,7 @@ fi | |||
1307 | 1307 | ||
1308 | if test -n "$ac_init_help"; then | 1308 | if test -n "$ac_init_help"; then |
1309 | case $ac_init_help in | 1309 | case $ac_init_help in |
1310 | short | recursive ) echo "Configuration of firejail 0.9.40~rc2:";; | 1310 | short | recursive ) echo "Configuration of firejail 0.9.40:";; |
1311 | esac | 1311 | esac |
1312 | cat <<\_ACEOF | 1312 | cat <<\_ACEOF |
1313 | 1313 | ||
@@ -1403,7 +1403,7 @@ fi | |||
1403 | test -n "$ac_init_help" && exit $ac_status | 1403 | test -n "$ac_init_help" && exit $ac_status |
1404 | if $ac_init_version; then | 1404 | if $ac_init_version; then |
1405 | cat <<\_ACEOF | 1405 | cat <<\_ACEOF |
1406 | firejail configure 0.9.40~rc2 | 1406 | firejail configure 0.9.40 |
1407 | generated by GNU Autoconf 2.69 | 1407 | generated by GNU Autoconf 2.69 |
1408 | 1408 | ||
1409 | Copyright (C) 2012 Free Software Foundation, Inc. | 1409 | Copyright (C) 2012 Free Software Foundation, Inc. |
@@ -1705,7 +1705,7 @@ cat >config.log <<_ACEOF | |||
1705 | This file contains any messages produced by compilers while | 1705 | This file contains any messages produced by compilers while |
1706 | running configure, to aid debugging if configure makes a mistake. | 1706 | running configure, to aid debugging if configure makes a mistake. |
1707 | 1707 | ||
1708 | It was created by firejail $as_me 0.9.40~rc2, which was | 1708 | It was created by firejail $as_me 0.9.40, which was |
1709 | generated by GNU Autoconf 2.69. Invocation command line was | 1709 | generated by GNU Autoconf 2.69. Invocation command line was |
1710 | 1710 | ||
1711 | $ $0 $@ | 1711 | $ $0 $@ |
@@ -4184,7 +4184,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |||
4184 | # report actual input values of CONFIG_FILES etc. instead of their | 4184 | # report actual input values of CONFIG_FILES etc. instead of their |
4185 | # values after options handling. | 4185 | # values after options handling. |
4186 | ac_log=" | 4186 | ac_log=" |
4187 | This file was extended by firejail $as_me 0.9.40~rc2, which was | 4187 | This file was extended by firejail $as_me 0.9.40, which was |
4188 | generated by GNU Autoconf 2.69. Invocation command line was | 4188 | generated by GNU Autoconf 2.69. Invocation command line was |
4189 | 4189 | ||
4190 | CONFIG_FILES = $CONFIG_FILES | 4190 | CONFIG_FILES = $CONFIG_FILES |
@@ -4238,7 +4238,7 @@ _ACEOF | |||
4238 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 4238 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
4239 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 4239 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
4240 | ac_cs_version="\\ | 4240 | ac_cs_version="\\ |
4241 | firejail config.status 0.9.40~rc2 | 4241 | firejail config.status 0.9.40 |
4242 | configured by $0, generated by GNU Autoconf 2.69, | 4242 | configured by $0, generated by GNU Autoconf 2.69, |
4243 | with options \\"\$ac_cs_config\\" | 4243 | with options \\"\$ac_cs_config\\" |
4244 | 4244 | ||
diff --git a/configure.ac b/configure.ac index 09b1076c4..47048046b 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,5 +1,5 @@ | |||
1 | AC_PREREQ([2.68]) | 1 | AC_PREREQ([2.68]) |
2 | AC_INIT(firejail, 0.9.40~rc2, netblue30@yahoo.com, , http://firejail.wordpress.com) | 2 | AC_INIT(firejail, 0.9.40, netblue30@yahoo.com, , http://firejail.wordpress.com) |
3 | AC_CONFIG_SRCDIR([src/firejail/main.c]) | 3 | AC_CONFIG_SRCDIR([src/firejail/main.c]) |
4 | #AC_CONFIG_HEADERS([config.h]) | 4 | #AC_CONFIG_HEADERS([config.h]) |
5 | 5 | ||
diff --git a/src/firejail/fs_bin.c b/src/firejail/fs_bin.c index 8ac9d4f3f..251a1cb8f 100644 --- a/src/firejail/fs_bin.c +++ b/src/firejail/fs_bin.c | |||
@@ -111,7 +111,7 @@ void fs_check_bin_list(void) { | |||
111 | // fprintf(stderr, "Warning: no --private-bin list executable found, option disabled\n"); | 111 | // fprintf(stderr, "Warning: no --private-bin list executable found, option disabled\n"); |
112 | // cfg.bin_private_keep = NULL; | 112 | // cfg.bin_private_keep = NULL; |
113 | // arg_private_bin = 0; | 113 | // arg_private_bin = 0; |
114 | // free(newlist); | 114 | free(newlist); |
115 | } | 115 | } |
116 | else { | 116 | else { |
117 | ptr = strrchr(newlist, ','); | 117 | ptr = strrchr(newlist, ','); |
diff --git a/test/configure b/test/configure index bdf36fcad..9acd021c8 100755 --- a/test/configure +++ b/test/configure | |||
@@ -28,7 +28,7 @@ ROOTDIR="/tmp/chroot" # default chroot directory | |||
28 | DEFAULT_FILES="/bin/bash /bin/sh " # basic chroot files | 28 | DEFAULT_FILES="/bin/bash /bin/sh " # basic chroot files |
29 | DEFAULT_FILES+="/etc/passwd /etc/nsswitch.conf /etc/group " | 29 | DEFAULT_FILES+="/etc/passwd /etc/nsswitch.conf /etc/group " |
30 | DEFAULT_FILES+=`find /lib -name libnss*` # files required by glibc | 30 | DEFAULT_FILES+=`find /lib -name libnss*` # files required by glibc |
31 | DEFAULT_FILES+=" /bin/cp /bin/ls /bin/cat /bin/ps /bin/netstat /bin/ping /sbin/ifconfig /usr/bin/touch /bin/hostname /bin/grep /usr/bin/dig /usr/bin/openssl /usr/bin/id /usr/bin/getent /usr/bin/whoami /usr/bin/wc /usr/bin/wget /bin/umount" | 31 | DEFAULT_FILES+=" /bin/cp /bin/ls /bin/cat /bin/ps /bin/netstat /bin/ping /sbin/ifconfig /usr/bin/touch /bin/ip /bin/hostname /bin/grep /usr/bin/dig /usr/bin/openssl /usr/bin/id /usr/bin/getent /usr/bin/whoami /usr/bin/wc /usr/bin/wget /bin/umount" |
32 | 32 | ||
33 | rm -fr $ROOTDIR | 33 | rm -fr $ROOTDIR |
34 | mkdir -p $ROOTDIR/{root,bin,lib,lib64,usr,home,etc,dev/shm,tmp,var/run,var/tmp,var/lock,var/log,proc} | 34 | mkdir -p $ROOTDIR/{root,bin,lib,lib64,usr,home,etc,dev/shm,tmp,var/run,var/tmp,var/lock,var/log,proc} |
diff --git a/test/test-root.sh b/test/test-root.sh index 7e1a0b968..aca48d334 100755 --- a/test/test-root.sh +++ b/test/test-root.sh | |||
@@ -9,7 +9,7 @@ echo "TESTING: profile tmpfs (profile_tmpfs)" | |||
9 | ./profile_tmpfs.exp | 9 | ./profile_tmpfs.exp |
10 | 10 | ||
11 | echo "TESTING: network interfaces (net_interface.exp)" | 11 | echo "TESTING: network interfaces (net_interface.exp)" |
12 | ./net_interface.exp | 12 | ./network/net_interface.exp |
13 | 13 | ||
14 | echo "TESTING: chroot (fs_chroot_asroot.exp)" | 14 | echo "TESTING: chroot (fs_chroot_asroot.exp)" |
15 | ./fs_chroot_asroot.exp | 15 | ./fs_chroot_asroot.exp |
@@ -48,13 +48,13 @@ echo "TESTING: /proc/sysrq-trigger reset disabled (sysrq-trigger.exp)" | |||
48 | ./sysrq-trigger.exp | 48 | ./sysrq-trigger.exp |
49 | 49 | ||
50 | echo "TESTING: seccomp umount (seccomp-umount.exp)" | 50 | echo "TESTING: seccomp umount (seccomp-umount.exp)" |
51 | ./seccomp-umount.exp | 51 | ./filters/seccomp-umount.exp |
52 | 52 | ||
53 | echo "TESTING: seccomp chmod (seccomp-chmod.exp)" | 53 | echo "TESTING: seccomp chmod (seccomp-chmod.exp)" |
54 | ./seccomp-chmod.exp | 54 | ./filters/seccomp-chmod.exp |
55 | 55 | ||
56 | echo "TESTING: seccomp chown (seccomp-chown.exp)" | 56 | echo "TESTING: seccomp chown (seccomp-chown.exp)" |
57 | ./seccomp-chown.exp | 57 | ./filters/seccomp-chown.exp |
58 | 58 | ||
59 | echo "TESTING: bind directory (option_bind_directory.exp)" | 59 | echo "TESTING: bind directory (option_bind_directory.exp)" |
60 | ./option_bind_directory.exp | 60 | ./option_bind_directory.exp |