diff options
author | smitsohu <smitsohu@gmail.com> | 2018-08-19 19:32:04 +0200 |
---|---|---|
committer | smitsohu <smitsohu@gmail.com> | 2018-08-19 19:32:04 +0200 |
commit | b1263f2826009c0a288a46f844177f7a4eee470b (patch) | |
tree | 333ff6698ecfa07df57cdd1a1b39459140f3f2cd | |
parent | small enhancement to join.c (ready-for-join is always a regular file) (diff) | |
parent | Warn when /usr/local/bin/<program> already exists and is not a symlink (fixes... (diff) | |
download | firejail-b1263f2826009c0a288a46f844177f7a4eee470b.tar.gz firejail-b1263f2826009c0a288a46f844177f7a4eee470b.tar.zst firejail-b1263f2826009c0a288a46f844177f7a4eee470b.zip |
Merge branch 'master' of https://github.com/netblue30/firejail
-rw-r--r-- | etc/firejail-default | 2 | ||||
-rw-r--r-- | src/firecfg/main.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/etc/firejail-default b/etc/firejail-default index 3542d9bc9..09dc896e6 100644 --- a/etc/firejail-default +++ b/etc/firejail-default | |||
@@ -10,7 +10,7 @@ | |||
10 | ########## | 10 | ########## |
11 | @{PID}={[1-9],[1-9][0-9],[1-9][0-9][0-9],[1-9][0-9][0-9][0-9],[1-9][0-9][0-9][0-9][0-9],[1-9][0-9][0-9][0-9][0-9][0-9],[1-4][0-9][0-9][0-9][0-9][0-9][0-9]} | 11 | @{PID}={[1-9],[1-9][0-9],[1-9][0-9][0-9],[1-9][0-9][0-9][0-9],[1-9][0-9][0-9][0-9][0-9],[1-9][0-9][0-9][0-9][0-9][0-9],[1-4][0-9][0-9][0-9][0-9][0-9][0-9]} |
12 | 12 | ||
13 | profile /etc/apparmor.d/firejail-default flags=(attach_disconnected,mediate_deleted) { | 13 | profile firejail-default flags=(attach_disconnected,mediate_deleted) { |
14 | 14 | ||
15 | ########## | 15 | ########## |
16 | # Allow D-Bus access. It may negatively affect security. Comment those lines or | 16 | # Allow D-Bus access. It may negatively affect security. Comment those lines or |
diff --git a/src/firecfg/main.c b/src/firecfg/main.c index 6fe220d35..d79b8bb8e 100644 --- a/src/firecfg/main.c +++ b/src/firecfg/main.c | |||
@@ -161,6 +161,9 @@ static void set_file(const char *name, const char *firejail_exec) { | |||
161 | else | 161 | else |
162 | printf(" %s created\n", name); | 162 | printf(" %s created\n", name); |
163 | } | 163 | } |
164 | else { | ||
165 | fprintf(stderr, "Warning: cannot create %s - already exists! Skipping...\n", fname); | ||
166 | } | ||
164 | 167 | ||
165 | free(fname); | 168 | free(fname); |
166 | } | 169 | } |