5 files changed, 16 insertions, 16 deletions

diff --git a/configure b/configure
index 46e792f64..946fb99bc 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for firejail 0.9.40~rc2.
+# Generated by GNU Autoconf 2.69 for firejail 0.9.40.
 #
 # Report bugs to <netblue30@yahoo.com>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='firejail'
 PACKAGE_TARNAME='firejail'
-PACKAGE_VERSION='0.9.40~rc2'
-PACKAGE_STRING='firejail 0.9.40~rc2'
+PACKAGE_VERSION='0.9.40'
+PACKAGE_STRING='firejail 0.9.40'
 PACKAGE_BUGREPORT='netblue30@yahoo.com'
 PACKAGE_URL='http://firejail.wordpress.com'
 
@@ -1246,7 +1246,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures firejail 0.9.40~rc2 to adapt to many kinds of systems.
+\`configure' configures firejail 0.9.40 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1307,7 +1307,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of firejail 0.9.40~rc2:";;
+     short | recursive ) echo "Configuration of firejail 0.9.40:";;
    esac
   cat <<\_ACEOF
 
@@ -1403,7 +1403,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-firejail configure 0.9.40~rc2
+firejail configure 0.9.40
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1705,7 +1705,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by firejail $as_me 0.9.40~rc2, which was
+It was created by firejail $as_me 0.9.40, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4184,7 +4184,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by firejail $as_me 0.9.40~rc2, which was
+This file was extended by firejail $as_me 0.9.40, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4238,7 +4238,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-firejail config.status 0.9.40~rc2
+firejail config.status 0.9.40
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 09b1076c4..47048046b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.68])
-AC_INIT(firejail, 0.9.40~rc2, netblue30@yahoo.com, , http://firejail.wordpress.com)
+AC_INIT(firejail, 0.9.40, netblue30@yahoo.com, , http://firejail.wordpress.com)
 AC_CONFIG_SRCDIR([src/firejail/main.c])
 #AC_CONFIG_HEADERS([config.h])
 
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) {
 //              fprintf(stderr, "Warning: no --private-bin list executable found, option disabled\n");
 //              cfg.bin_private_keep = NULL;
 //              arg_private_bin = 0;
-//              free(newlist);
+                free(newlist);
         }
         else {
                 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
 DEFAULT_FILES="/bin/bash /bin/sh "      # basic chroot files
 DEFAULT_FILES+="/etc/passwd /etc/nsswitch.conf /etc/group "
 DEFAULT_FILES+=`find /lib -name libnss*`        # files required by glibc
-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"
+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"
 
 rm -fr $ROOTDIR
 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)"
 ./profile_tmpfs.exp
 
 echo "TESTING: network interfaces (net_interface.exp)"
-./net_interface.exp
+./network/net_interface.exp
 
 echo "TESTING: chroot (fs_chroot_asroot.exp)"
 ./fs_chroot_asroot.exp
@@ -48,13 +48,13 @@ echo "TESTING: /proc/sysrq-trigger reset disabled (sysrq-trigger.exp)"
 ./sysrq-trigger.exp
 
 echo "TESTING: seccomp umount (seccomp-umount.exp)"
-./seccomp-umount.exp
+./filters/seccomp-umount.exp
 
 echo "TESTING: seccomp chmod (seccomp-chmod.exp)"
-./seccomp-chmod.exp
+./filters/seccomp-chmod.exp
 
 echo "TESTING: seccomp chown (seccomp-chown.exp)"
-./seccomp-chown.exp
+./filters/seccomp-chown.exp
 
 echo "TESTING: bind directory (option_bind_directory.exp)"
 ./option_bind_directory.exp