diff options
author | netblue30 <netblue30@yahoo.com> | 2015-11-12 09:25:47 -0500 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2015-11-12 09:25:47 -0500 |
commit | 85f5e7c7269eff04e1d48c9a3bd155404f8dfb6a (patch) | |
tree | 8ad69f8fbc7c5978985559ded16bc898e924e60a /src | |
parent | fixes (diff) | |
download | firejail-85f5e7c7269eff04e1d48c9a3bd155404f8dfb6a.tar.gz firejail-85f5e7c7269eff04e1d48c9a3bd155404f8dfb6a.tar.zst firejail-85f5e7c7269eff04e1d48c9a3bd155404f8dfb6a.zip |
removed private.keep (deprecated)
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/main.c | 3 | ||||
-rw-r--r-- | src/firejail/profile.c | 3 | ||||
-rw-r--r-- | src/man/firejail.txt | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/src/firejail/main.c b/src/firejail/main.c index 7f6d3a1f8..37bf22cae 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c | |||
@@ -798,8 +798,7 @@ int main(int argc, char **argv) { | |||
798 | fs_check_private_dir(); | 798 | fs_check_private_dir(); |
799 | arg_private = 1; | 799 | arg_private = 1; |
800 | } | 800 | } |
801 | else if ((strncmp(argv[i], "--private.keep=", 15) == 0) | 801 | else if (strncmp(argv[i], "--private-home=", 15) == 0) { |
802 | || (strncmp(argv[i], "--private-home=", 15) == 0)) { | ||
803 | if (cfg.home_private) { | 802 | if (cfg.home_private) { |
804 | fprintf(stderr, "Error: a private home directory was already defined with --private option.\n"); | 803 | fprintf(stderr, "Error: a private home directory was already defined with --private option.\n"); |
805 | exit(1); | 804 | exit(1); |
diff --git a/src/firejail/profile.c b/src/firejail/profile.c index 73407d9c0..caa43288b 100644 --- a/src/firejail/profile.c +++ b/src/firejail/profile.c | |||
@@ -262,8 +262,7 @@ int profile_check_line(char *ptr, int lineno) { | |||
262 | } | 262 | } |
263 | 263 | ||
264 | // private home list of files and directories | 264 | // private home list of files and directories |
265 | if ((strncmp(ptr, "private.keep ", 13) == 0) | 265 | if (strncmp(ptr, "private-home ", 13) == 0) { |
266 | || (strncmp(ptr, "private-home ", 13) == 0)) { | ||
267 | cfg.home_private_keep = ptr + 13; | 266 | cfg.home_private_keep = ptr + 13; |
268 | fs_check_home_list(); | 267 | fs_check_home_list(); |
269 | arg_private = 1; | 268 | arg_private = 1; |
diff --git a/src/man/firejail.txt b/src/man/firejail.txt index 2a0c9eb47..46129fdb2 100644 --- a/src/man/firejail.txt +++ b/src/man/firejail.txt | |||
@@ -818,10 +818,6 @@ $ ls /bin | |||
818 | bash cat ls sed | 818 | bash cat ls sed |
819 | 819 | ||
820 | .TP | 820 | .TP |
821 | \fB\-\-private-keep=file,directory | ||
822 | This option is deprecated, use private-home instead | ||
823 | |||
824 | .TP | ||
825 | \fB\-\-private-home=file,directory | 821 | \fB\-\-private-home=file,directory |
826 | Build a new user home in a temporary | 822 | Build a new user home in a temporary |
827 | filesystem, and copy the files and directories in the list in the | 823 | filesystem, and copy the files and directories in the list in the |