diff options
author | netblue30 <netblue30@yahoo.com> | 2016-09-17 08:38:57 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2016-09-17 08:38:57 -0400 |
commit | f3aa0772637dcc891fac8cab6248e5ded55ef07b (patch) | |
tree | 3a89faf1ef1fb20882f6664fac2abeee471a0b6f | |
parent | testing (diff) | |
download | firejail-f3aa0772637dcc891fac8cab6248e5ded55ef07b.tar.gz firejail-f3aa0772637dcc891fac8cab6248e5ded55ef07b.tar.zst firejail-f3aa0772637dcc891fac8cab6248e5ded55ef07b.zip |
bug: configuration file should be owned by root, issue 786
-rw-r--r-- | src/firejail/checkcfg.c | 2 | ||||
-rw-r--r-- | src/firejail/env.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c index 34078492e..fdd2b8edd 100644 --- a/src/firejail/checkcfg.c +++ b/src/firejail/checkcfg.c | |||
@@ -61,7 +61,7 @@ int checkcfg(int val) { | |||
61 | struct stat s; | 61 | struct stat s; |
62 | if (stat(fname, &s) == -1) | 62 | if (stat(fname, &s) == -1) |
63 | errExit("stat"); | 63 | errExit("stat"); |
64 | if (s.st_uid != 0 || s.st_gid != 0) { | 64 | if (s.st_uid != 0) { |
65 | fprintf(stderr, "Error: configuration file should be owned by root\n"); | 65 | fprintf(stderr, "Error: configuration file should be owned by root\n"); |
66 | exit(1); | 66 | exit(1); |
67 | } | 67 | } |
diff --git a/src/firejail/env.c b/src/firejail/env.c index 88cd6918d..a02c67ae1 100644 --- a/src/firejail/env.c +++ b/src/firejail/env.c | |||
@@ -119,6 +119,8 @@ void env_defaults(void) { | |||
119 | // fix qt 4.8 | 119 | // fix qt 4.8 |
120 | if (setenv("QT_X11_NO_MITSHM", "1", 1) < 0) | 120 | if (setenv("QT_X11_NO_MITSHM", "1", 1) < 0) |
121 | errExit("setenv"); | 121 | errExit("setenv"); |
122 | // if (setenv("MOZ_NO_REMOTE, "1", 1) < 0) | ||
123 | // errExit("setenv"); | ||
122 | if (setenv("container", "firejail", 1) < 0) // LXC sets container=lxc, | 124 | if (setenv("container", "firejail", 1) < 0) // LXC sets container=lxc, |
123 | errExit("setenv"); | 125 | errExit("setenv"); |
124 | if (!cfg.shell) | 126 | if (!cfg.shell) |