Merge branch 'master' of http://github.com/netblue30/firejail

2 files changed, 13 insertions, 3 deletions

diff --git a/src/firejail/fs_trace.c b/src/firejail/fs_trace.c
index 38ab7e2f8..235e09291 100644
--- a/src/firejail/fs_trace.c
+++ b/src/firejail/fs_trace.c
@@ -51,7 +51,7 @@ void fs_trace(void) {
         FILE *fp = fopen(RUN_LDPRELOAD_FILE, "w");
         if (!fp)
                 errExit("fopen");
-        const char *prefix = LIBDIR "/firejail";
+        const char *prefix = RUN_FIREJAIL_LIB_DIR;
 
         if (arg_trace) {
                 fprintf(fp, "%s/libtrace.so\n", prefix);
diff --git a/src/firejail/join.c b/src/firejail/join.c
index c2b207c52..c849b200c 100644
--- a/src/firejail/join.c
+++ b/src/firejail/join.c
@@ -436,8 +436,18 @@ void join(pid_t pid, int argc, char **argv, int index) {
                 // it will never get here!!!
         }
 
+        int status = 0;
         // wait for the child to finish
-        waitpid(child, NULL, 0);
+        waitpid(child, &status, 0);
         flush_stdin();
-        exit(0);
+
+        if (WIFEXITED(status)) {
+                status = WEXITSTATUS(status);
+        } else if (WIFSIGNALED(status)) {
+                status = WTERMSIG(status);
+        } else {
+                status = 0;
+        }
+
+        exit(status);
 }