make join timeout configurable in firejail.config

3 files changed, 8 insertions, 1 deletions

diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c
index f94b95d60..6ea92cd9d 100644
--- a/src/firejail/checkcfg.c
+++ b/src/firejail/checkcfg.c
@@ -31,6 +31,7 @@ char *xpra_extra_params = "";
 char *xvfb_screen = "800x600x24";
 char *xvfb_extra_params = "";
 char *netfilter_default = NULL;
+unsigned join_timeout = 50; // 5 sec (unit is 0.1 sec)
 
 int checkcfg(int val) {
         assert(val < CFG_MAX);
@@ -213,6 +214,11 @@ int checkcfg(int val) {
                                 if (setenv("FIREJAIL_FILE_COPY_LIMIT", ptr + 16, 1) == -1)
                                         errExit("setenv");
                         }
+
+                        // timeout for join option
+                        else if (strncmp(ptr, "join-timeout ", 13) == 0)
+                                join_timeout = strtoul(ptr + 13, NULL, 10) * 10;
+
                         else
                                 goto errout;
 
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index a8c580aa1..37d8c6883 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -738,6 +738,7 @@ extern char *xpra_extra_params;
 extern char *xvfb_screen;
 extern char *xvfb_extra_params;
 extern char *netfilter_default;
+extern unsigned join_timeout;
 int checkcfg(int val);
 void print_compiletime_support(void);
 
diff --git a/src/firejail/join.c b/src/firejail/join.c
index 864d4069d..08120cffe 100644
--- a/src/firejail/join.c
+++ b/src/firejail/join.c
@@ -322,7 +322,7 @@ void check_join_permission(pid_t pid) {
         // check if pid belongs to a fully set up firejail sandbox
         unsigned i;
         for (i = 0; is_ready_for_join(pid) == 0; i++) { // give sandbox some time to start up
-                if (i >= 50) {
+                if (i >= join_timeout) {
                         fprintf(stderr, "Error: no valid sandbox\n");
                         exit(1);
                 }