diff options
author | startx2017 <vradu.startx@yandex.com> | 2018-06-19 09:24:48 -0400 |
---|---|---|
committer | startx2017 <vradu.startx@yandex.com> | 2018-06-19 09:24:48 -0400 |
commit | b65dfff0f3b7ff5a16771ac4eca80d0609cbbf44 (patch) | |
tree | 762a5e4e732f2d9cc6d4f92f10bc33272a7bc77d /src | |
parent | Update private-bin for ark.profile, fixes #2001 (diff) | |
download | firejail-b65dfff0f3b7ff5a16771ac4eca80d0609cbbf44.tar.gz firejail-b65dfff0f3b7ff5a16771ac4eca80d0609cbbf44.tar.zst firejail-b65dfff0f3b7ff5a16771ac4eca80d0609cbbf44.zip |
merge from LTS branch: cleanup O_PATH, --private-template
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/firejail.h | 6 | ||||
-rw-r--r-- | src/firejail/fs.c | 5 | ||||
-rw-r--r-- | src/firejail/main.c | 1 | ||||
-rw-r--r-- | src/firejail/pulseaudio.c | 6 | ||||
-rw-r--r-- | src/firejail/util.c | 5 |
5 files changed, 0 insertions, 23 deletions
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h index 92a18af25..6ee7d9b14 100644 --- a/src/firejail/firejail.h +++ b/src/firejail/firejail.h | |||
@@ -227,7 +227,6 @@ typedef struct config_t { | |||
227 | char *lib_private_keep; // keep list for private bin directory | 227 | char *lib_private_keep; // keep list for private bin directory |
228 | char *cwd; // current working directory | 228 | char *cwd; // current working directory |
229 | char *overlay_dir; | 229 | char *overlay_dir; |
230 | char *private_template; // template dir for tmpfs home | ||
231 | 230 | ||
232 | // networking | 231 | // networking |
233 | char *name; // sandbox name | 232 | char *name; // sandbox name |
@@ -307,7 +306,6 @@ static inline int any_interface_configured(void) { | |||
307 | } | 306 | } |
308 | 307 | ||
309 | extern int arg_private; // mount private /home | 308 | extern int arg_private; // mount private /home |
310 | extern int arg_private_template; // private /home template | ||
311 | extern int arg_private_cache; // private home/.cache | 309 | extern int arg_private_cache; // private home/.cache |
312 | extern int arg_debug; // print debug messages | 310 | extern int arg_debug; // print debug messages |
313 | extern int arg_debug_blacklists; // print debug messages for blacklists | 311 | extern int arg_debug_blacklists; // print debug messages for blacklists |
@@ -567,12 +565,8 @@ void fs_dev_disable_u2f(void); | |||
567 | void fs_private(void); | 565 | void fs_private(void); |
568 | // private mode (--private=homedir) | 566 | // private mode (--private=homedir) |
569 | void fs_private_homedir(void); | 567 | void fs_private_homedir(void); |
570 | // private template (--private-template=templatedir) | ||
571 | void fs_private_template(void); | ||
572 | // check new private home directory (--private= option) - exit if it fails | 568 | // check new private home directory (--private= option) - exit if it fails |
573 | void fs_check_private_dir(void); | 569 | void fs_check_private_dir(void); |
574 | // check new private template home directory (--private-template= option) exit if it fails | ||
575 | void fs_check_private_template(void); | ||
576 | void fs_private_home_list(void); | 570 | void fs_private_home_list(void); |
577 | 571 | ||
578 | 572 | ||
diff --git a/src/firejail/fs.c b/src/firejail/fs.c index 0e104699f..24ff553d7 100644 --- a/src/firejail/fs.c +++ b/src/firejail/fs.c | |||
@@ -27,12 +27,7 @@ | |||
27 | #include <glob.h> | 27 | #include <glob.h> |
28 | #include <dirent.h> | 28 | #include <dirent.h> |
29 | #include <errno.h> | 29 | #include <errno.h> |
30 | |||
31 | // on Debian 7 we are missing O_PATH definition | ||
32 | #include <fcntl.h> | 30 | #include <fcntl.h> |
33 | #ifndef O_PATH | ||
34 | #define O_PATH 010000000 | ||
35 | #endif | ||
36 | 31 | ||
37 | // check noblacklist statements not matched by a proper blacklist in disable-*.inc files | 32 | // check noblacklist statements not matched by a proper blacklist in disable-*.inc files |
38 | //#define TEST_NO_BLACKLIST_MATCHING | 33 | //#define TEST_NO_BLACKLIST_MATCHING |
diff --git a/src/firejail/main.c b/src/firejail/main.c index 6aebd9ab2..50b2da7b9 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c | |||
@@ -45,7 +45,6 @@ gid_t firejail_gid = 0; | |||
45 | static char child_stack[STACK_SIZE]; // space for child's stack | 45 | static char child_stack[STACK_SIZE]; // space for child's stack |
46 | Config cfg; // configuration | 46 | Config cfg; // configuration |
47 | int arg_private = 0; // mount private /home and /tmp directoryu | 47 | int arg_private = 0; // mount private /home and /tmp directoryu |
48 | int arg_private_template = 0; // mount private /home using a template | ||
49 | int arg_private_cache = 0; // mount private home/.cache | 48 | int arg_private_cache = 0; // mount private home/.cache |
50 | int arg_debug = 0; // print debug messages | 49 | int arg_debug = 0; // print debug messages |
51 | int arg_debug_blacklists = 0; // print debug messages for blacklists | 50 | int arg_debug_blacklists = 0; // print debug messages for blacklists |
diff --git a/src/firejail/pulseaudio.c b/src/firejail/pulseaudio.c index e39f6f50c..521f144e8 100644 --- a/src/firejail/pulseaudio.c +++ b/src/firejail/pulseaudio.c | |||
@@ -23,13 +23,7 @@ | |||
23 | #include <sys/mount.h> | 23 | #include <sys/mount.h> |
24 | #include <dirent.h> | 24 | #include <dirent.h> |
25 | #include <sys/wait.h> | 25 | #include <sys/wait.h> |
26 | |||
27 | // on Debian 7 we are missing O_PATH definition | ||
28 | #include <fcntl.h> | 26 | #include <fcntl.h> |
29 | #ifndef O_PATH | ||
30 | #define O_PATH 010000000 | ||
31 | #endif | ||
32 | |||
33 | 27 | ||
34 | // disable pulseaudio socket | 28 | // disable pulseaudio socket |
35 | void pulseaudio_disable(void) { | 29 | void pulseaudio_disable(void) { |
diff --git a/src/firejail/util.c b/src/firejail/util.c index f6233359a..eb59e36be 100644 --- a/src/firejail/util.c +++ b/src/firejail/util.c | |||
@@ -29,12 +29,7 @@ | |||
29 | #include <sys/ioctl.h> | 29 | #include <sys/ioctl.h> |
30 | #include <termios.h> | 30 | #include <termios.h> |
31 | #include <sys/wait.h> | 31 | #include <sys/wait.h> |
32 | |||
33 | // on Debian 7 we are missing O_PATH definition | ||
34 | #include <fcntl.h> | 32 | #include <fcntl.h> |
35 | #ifndef O_PATH | ||
36 | #define O_PATH 010000000 | ||
37 | #endif | ||
38 | 33 | ||
39 | #define MAX_GROUPS 1024 | 34 | #define MAX_GROUPS 1024 |
40 | 35 | ||