mainline merge: Make --join return exit code of the invoked program

2 files changed, 15 insertions, 2 deletions

diff --git a/src/firejail/join.c b/src/firejail/join.c
index 569cfcff7..731842275 100644
--- a/src/firejail/join.c
+++ b/src/firejail/join.c
@@ -386,8 +386,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);
 }
diff --git a/status b/status
index b3d41cbef..76cc53b92 100644
--- a/status
+++ b/status
@@ -1,5 +1,8 @@
+todo - Oct 13: update profiles, README
+todo - Oct 17: Fix docs on default seccomp list: change mfsservctl -> nfsservctl and…
 
 Oct 17: improve clean_pathname function
+Oct 14: Make --join return exit code of the invoked program
 
 Oct 12: full merge
 done: fs_whitelist: no warning if macro resolution fails because of missing…