aboutsummaryrefslogtreecommitdiffstats
path: root/src/firejail/checkcfg.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/firejail/checkcfg.c')
-rw-r--r--src/firejail/checkcfg.c21
1 files changed, 17 insertions, 4 deletions
diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c
index 476ecbe10..f76f83d85 100644
--- a/src/firejail/checkcfg.c
+++ b/src/firejail/checkcfg.c
@@ -92,6 +92,15 @@ int checkcfg(int val) {
92 else 92 else
93 goto errout; 93 goto errout;
94 } 94 }
95 // join
96 else if (strncmp(ptr, "join ", 5) == 0) {
97 if (strcmp(ptr + 5, "yes") == 0)
98 cfg_val[CFG_JOIN] = 1;
99 else if (strcmp(ptr + 5, "no") == 0)
100 cfg_val[CFG_JOIN] = 0;
101 else
102 goto errout;
103 }
95 // x11 104 // x11
96 else if (strncmp(ptr, "x11 ", 4) == 0) { 105 else if (strncmp(ptr, "x11 ", 4) == 0) {
97 if (strcmp(ptr + 4, "yes") == 0) 106 if (strcmp(ptr + 4, "yes") == 0)
@@ -282,6 +291,10 @@ int checkcfg(int val) {
282 else if (strncmp(ptr, "quiet-by-default ", 17) == 0) { 291 else if (strncmp(ptr, "quiet-by-default ", 17) == 0) {
283 if (strcmp(ptr + 17, "yes") == 0) 292 if (strcmp(ptr + 17, "yes") == 0)
284 arg_quiet = 1; 293 arg_quiet = 1;
294 else if (strcmp(ptr + 17, "no") == 0)
295 arg_quiet = 0;
296 else
297 goto errout;
285 } 298 }
286 // remount /proc and /sys 299 // remount /proc and /sys
287 else if (strncmp(ptr, "remount-proc-sys ", 17) == 0) { 300 else if (strncmp(ptr, "remount-proc-sys ", 17) == 0) {
@@ -404,16 +417,16 @@ void print_compiletime_support(void) {
404#endif 417#endif
405 ); 418 );
406 419
407 printf("\t- networking support is %s\n", 420 printf("\t- git install support is %s\n",
408#ifdef HAVE_NETWORK 421#ifdef HAVE_GIT_INSTALL
409 "enabled" 422 "enabled"
410#else 423#else
411 "disabled" 424 "disabled"
412#endif 425#endif
413 ); 426 );
414 427
415 printf("\t- git install support is %s\n", 428 printf("\t- networking support is %s\n",
416#ifdef HAVE_GIT_INSTALL 429#ifdef HAVE_NETWORK
417 "enabled" 430 "enabled"
418#else 431#else
419 "disabled" 432 "disabled"