aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/firejail/checkcfg.c7
-rw-r--r--src/firejail/env.c2
-rw-r--r--src/firejail/fs.c10
3 files changed, 17 insertions, 2 deletions
diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c
index 12921e294..3b60dafb6 100644
--- a/src/firejail/checkcfg.c
+++ b/src/firejail/checkcfg.c
@@ -220,7 +220,12 @@ int checkcfg(int val) {
220 if (!xephyr_extra_params) 220 if (!xephyr_extra_params)
221 errExit("strdup"); 221 errExit("strdup");
222 } 222 }
223 223
224 // quiet by default
225 else if (strncmp(ptr, "quiet-by-default ", 17) == 0) {
226 if (strcmp(ptr + 17, "yes") == 0)
227 arg_quiet = 1;
228 }
224 else 229 else
225 goto errout; 230 goto errout;
226 231
diff --git a/src/firejail/env.c b/src/firejail/env.c
index a5b3ccfb3..79d6b81e3 100644
--- a/src/firejail/env.c
+++ b/src/firejail/env.c
@@ -133,7 +133,7 @@ void env_defaults(void) {
133 errExit("setenv"); 133 errExit("setenv");
134 134
135 // set the window title 135 // set the window title
136 printf("\033]0;firejail %s\007\n", cfg.window_title); 136 printf("\033]0;firejail %s\007", cfg.window_title);fflush(0);
137} 137}
138 138
139// parse and store the environment setting 139// parse and store the environment setting
diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index 5bcfa6066..86126672e 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -1064,6 +1064,16 @@ int fs_check_chroot_dir(const char *rootdir) {
1064 struct stat s; 1064 struct stat s;
1065 char *name; 1065 char *name;
1066 1066
1067 // rootdir has to be owned by root
1068 if (stat(rootdir, &s) != 0) {
1069 fprintf(stderr, "Error: cannot find chroot directory\n");
1070 return 1;
1071 }
1072 if (s.st_uid != 0) {
1073 fprintf(stderr, "Error: chroot directory should be owned by root\n");
1074 return 1;
1075 }
1076
1067 // check /dev 1077 // check /dev
1068 if (asprintf(&name, "%s/dev", rootdir) == -1) 1078 if (asprintf(&name, "%s/dev", rootdir) == -1)
1069 errExit("asprintf"); 1079 errExit("asprintf");