diff options
author | 2020-08-04 11:50:40 +0200 | |
---|---|---|
committer | 2020-08-04 11:50:40 +0200 | |
commit | 102f8d1fdca62dd0ca0fb355c1ef926f2594b48b (patch) | |
tree | 06265134def04fac10177f00e63e5efb45fe02e6 | |
parent | Add profile for otter-browser (#3564) (diff) | |
download | firejail-102f8d1fdca62dd0ca0fb355c1ef926f2594b48b.tar.gz firejail-102f8d1fdca62dd0ca0fb355c1ef926f2594b48b.tar.zst firejail-102f8d1fdca62dd0ca0fb355c1ef926f2594b48b.zip |
Support to ingore a include foobar.inc
closes #1139
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | RELNOTES | 2 | ||||
-rw-r--r-- | src/firejail/profile.c | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -196,4 +196,4 @@ gnome-screenshot, ripperX, sound-juicer, iagno, com.github.dahenson.agenda, gnom | |||
196 | penguin-command, x2goclient, frogatto, gnome-mines, gnome-nibbles, lightsoff, ts3client_runscript.sh, warmux, ferdi, abiword, | 196 | penguin-command, x2goclient, frogatto, gnome-mines, gnome-nibbles, lightsoff, ts3client_runscript.sh, warmux, ferdi, abiword, |
197 | four-in-a-row, gnome-mahjongg, gnome-robots, gnome-sudoku, gnome-taquin, gnome-tetravex, blobwars, gravity-beams-and-evaporating-stars, | 197 | four-in-a-row, gnome-mahjongg, gnome-robots, gnome-sudoku, gnome-taquin, gnome-tetravex, blobwars, gravity-beams-and-evaporating-stars, |
198 | hyperrogue, jumpnbump-menu, jumpnbump, magicor, mindless, mirrormagic, mrrescue, scorched3d-wrapper, scorchwentbonkers, | 198 | hyperrogue, jumpnbump-menu, jumpnbump, magicor, mindless, mirrormagic, mrrescue, scorched3d-wrapper, scorchwentbonkers, |
199 | seahorse-adventures, wordwarvi, xbill, gnome-klotski, five-or-more, swell-foop, fdns, jitsi-meet-desktop, nicontine, steam-runtime, apostrophe, quadrapassel, dino-im, strawberry, hitori, bijiben, gnote, gnubik, ZeGrapher, gapplication, xonotic-sdl-wrapper, openarena_ded, cawbird, freetube, homebank, mattermost-desktop, newsflash, com.gitlab.newsflash, element-desktop, sushi, xfce4-screenshooter, org.gnome.NautilusPreviewer, lyx, minitube, nuclear, mtpaint, minecraft-launcher, gnome-calendar | 199 | seahorse-adventures, wordwarvi, xbill, gnome-klotski, five-or-more, swell-foop, fdns, jitsi-meet-desktop, nicontine, steam-runtime, apostrophe, quadrapassel, dino-im, strawberry, hitori, bijiben, gnote, gnubik, ZeGrapher, gapplication, xonotic-sdl-wrapper, openarena_ded, cawbird, freetube, homebank, mattermost-desktop, newsflash, com.gitlab.newsflash, element-desktop, sushi, xfce4-screenshooter, org.gnome.NautilusPreviewer, lyx, minitube, nuclear, mtpaint, minecraft-launcher, gnome-calendar, vmware, git-cola, otter-browser |
@@ -17,6 +17,7 @@ firejail (0.9.63) baseline; urgency=low | |||
17 | * blacklist shells such as bash in several profiles | 17 | * blacklist shells such as bash in several profiles |
18 | * whitelist globbing | 18 | * whitelist globbing |
19 | * mkdir and mkfile support for /run/user directory | 19 | * mkdir and mkfile support for /run/user directory |
20 | * support ignore for include | ||
20 | * new condition: HAS_NOSOUND | 21 | * new condition: HAS_NOSOUND |
21 | * new profiles: gfeeds, firefox-x11, tvbrowser, rtv, clipgrab, muraster | 22 | * new profiles: gfeeds, firefox-x11, tvbrowser, rtv, clipgrab, muraster |
22 | * new profiles: gnome-passwordsafe, bibtex, gummi, latex, mupdf-x11-curl | 23 | * new profiles: gnome-passwordsafe, bibtex, gummi, latex, mupdf-x11-curl |
@@ -41,6 +42,7 @@ firejail (0.9.63) baseline; urgency=low | |||
41 | * new profiles: homebank, mattermost-desktop, newsflash, com.gitlab.newsflash | 42 | * new profiles: homebank, mattermost-desktop, newsflash, com.gitlab.newsflash |
42 | * new profiles: sushi, xfce4-screenshooter, org.gnome.NautilusPreviewer, lyx | 43 | * new profiles: sushi, xfce4-screenshooter, org.gnome.NautilusPreviewer, lyx |
43 | * new profiles: minitube, nuclear, mtpaint, minecraft-launcher, gnome-calendar | 44 | * new profiles: minitube, nuclear, mtpaint, minecraft-launcher, gnome-calendar |
45 | * new profiles: vmware, git-cola, otter-browser | ||
44 | -- netblue30 <netblue30@yahoo.com> Tue, 21 Apr 2020 08:00:00 -0500 | 46 | -- netblue30 <netblue30@yahoo.com> Tue, 21 Apr 2020 08:00:00 -0500 |
45 | 47 | ||
46 | firejail (0.9.62) baseline; urgency=low | 48 | firejail (0.9.62) baseline; urgency=low |
diff --git a/src/firejail/profile.c b/src/firejail/profile.c index a87222824..70acd8a2a 100644 --- a/src/firejail/profile.c +++ b/src/firejail/profile.c | |||
@@ -1685,7 +1685,7 @@ void profile_read(const char *fname) { | |||
1685 | } | 1685 | } |
1686 | 1686 | ||
1687 | // process include | 1687 | // process include |
1688 | if (strncmp(ptr, "include ", 8) == 0) { | 1688 | if (strncmp(ptr, "include ", 8) == 0 && !is_in_ignore_list(ptr)) { |
1689 | include_level++; | 1689 | include_level++; |
1690 | 1690 | ||
1691 | // expand macros in front of the include profile file | 1691 | // expand macros in front of the include profile file |