private-lib fix

3 files changed, 23 insertions, 12 deletions

diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c
index 56a66742a..59c0c5261 100644
--- a/src/firejail/fs_lib.c
+++ b/src/firejail/fs_lib.c
@@ -69,6 +69,9 @@ static char *build_dest_dir(const char *full_path) {
 // copy fname in private_run_dir
 void fslib_duplicate(const char *full_path) {
         assert(full_path);
+        if (arg_debug)
+                printf("fslib_duplicate %s\n", full_path);
+
         struct stat s;
         if (stat(full_path, &s) != 0 || s.st_uid != 0 || access(full_path, R_OK))
                 return;
@@ -105,6 +108,10 @@ void fslib_duplicate(const char *full_path) {
 // it could be a library or an executable
 // lib is not copied, only libraries used by it
 void fslib_copy_libs(const char *full_path) {
+        assert(full_path);
+        if (arg_debug)
+                printf("fslib_copy_libs %s\n", full_path);
+
         // if library/executable does not exist or the user does not have read access to it
         // print a warning and exit the function.
         if (access(full_path, R_OK)) {
@@ -120,6 +127,8 @@ void fslib_copy_libs(const char *full_path) {
                 errExit("chown");
 
         // run fldd to extact the list of files
+        if (arg_debug)
+                printf("runing fldd %s\n", full_path);
         sbox_run(SBOX_USER | SBOX_SECCOMP | SBOX_CAPS_NONE, 3, PATH_FLDD, full_path, RUN_LIB_FILE);
 
         // open the list of libraries and install them on by one
@@ -141,6 +150,9 @@ void fslib_copy_libs(const char *full_path) {
 
 void fslib_copy_dir(const char *full_path) {
         assert(full_path);
+        if (arg_debug)
+                printf("fslib_copy_dir %s\n", full_path);
+
         // do nothing if the directory does not exist or is not owned by root
         struct stat s;
         if (stat(full_path, &s) != 0 || s.st_uid != 0 || !S_ISDIR(s.st_mode) || access(full_path, R_OK))
@@ -151,8 +163,6 @@ void fslib_copy_dir(const char *full_path) {
         dir_name++;
         assert(*dir_name != '\0');
 
-
-
         // do nothing if the directory is already there
         char *dest;
         if (asprintf(&dest, "%s/%s", build_dest_dir(full_path), dir_name) == -1)
@@ -371,12 +381,17 @@ void fs_private_lib(void) {
         if (!arg_quiet)
                 fprintf(stderr, "Installed %d libraries and %d directories\n", lib_cnt, dir_cnt);
 
-        // for our trace and tracelog libs
-        if (arg_trace)
-                fslib_duplicate(LIBDIR "/firejail/libtrace.so");
-        else if (arg_tracelog)
-                fslib_duplicate(LIBDIR "/firejail/libtracelog.so");
-
+        // bring in firejail directory for --trace options
+        fslib_copy_dir(LIBDIR "/firejail");
+
+        // ... and for sandbox in sandbox functionality
+        fslib_copy_libs(LIBDIR "/firejail/faudit");
+        fslib_copy_libs(LIBDIR "/firejail/fbuilder");
+        fslib_copy_libs(LIBDIR "/firejail/fcopy");
+        fslib_copy_libs(LIBDIR "/firejail/fldd");
+        fslib_copy_libs(LIBDIR "/firejail/fnet");
+        fslib_copy_libs(LIBDIR "/firejail/fseccomp");
+        fslib_copy_libs(LIBDIR "/firejail/ftee");
         // mount lib filesystem
         mount_directories();
 }
diff --git a/src/firejail/fs_lib2.c b/src/firejail/fs_lib2.c
index 86e7c0ba7..e5c6bdaed 100644
--- a/src/firejail/fs_lib2.c
+++ b/src/firejail/fs_lib2.c
@@ -122,8 +122,6 @@ void fslib_install_stdc(void) {
                 fprintf(stderr, "Standard C library installed in %0.2f ms\n", timetrace_end());
 }
 
-void fslib_install_locale(void);
-
 
 //***************************************************************
 // various system libraries
diff --git a/src/firejail/fs_trace.c b/src/firejail/fs_trace.c
index c87d29b5c..496c2aa4e 100644
--- a/src/firejail/fs_trace.c
+++ b/src/firejail/fs_trace.c
@@ -52,8 +52,6 @@ void fs_trace(void) {
         if (!fp)
                 errExit("fopen");
         const char *prefix = LIBDIR "/firejail";
-        if (arg_private_lib)
-                prefix = RUN_LIB_DIR;
 
         if (arg_trace) {
                 fprintf(fp, "%s/libtrace.so\n", prefix);