aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar rusty-snake <print_hello_world+Public@protonmail.com>2020-03-15 10:34:51 +0100
committerLibravatar rusty-snake <print_hello_world+Public@protonmail.com>2020-03-15 10:34:51 +0100
commit18ee4e15554aa486dd9bdc18f578af7f9d917334 (patch)
treeb0ab00222a82b0fb4552a1588217daacbaca0010
parentUpdate file.profile (diff)
downloadfirejail-18ee4e15554aa486dd9bdc18f578af7f9d917334.tar.gz
firejail-18ee4e15554aa486dd9bdc18f578af7f9d917334.tar.zst
firejail-18ee4e15554aa486dd9bdc18f578af7f9d917334.zip
new condition: HAS_NOSOUND
-rw-r--r--RELNOTES1
-rw-r--r--src/firejail/profile.c5
-rw-r--r--src/man/firejail-profile.txt2
3 files changed, 7 insertions, 1 deletions
diff --git a/RELNOTES b/RELNOTES
index df0e3ec85..15a0c34e5 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -2,6 +2,7 @@ firejail (0.9.63) baseline; urgency=low
2 * work in progress 2 * work in progress
3 * DHCP client support 3 * DHCP client support
4 * SELinux labeling support 4 * SELinux labeling support
5 * new condition: HAS_NOSOUND
5 * new profiles: gfeeds, firefox-x11, tvbrowser, rtv, clipgrab, muraster 6 * new profiles: gfeeds, firefox-x11, tvbrowser, rtv, clipgrab, muraster
6 * new profiles: gnome-passwordsafe, bibtex, gummi, latex, mupdf-x11-curl 7 * new profiles: gnome-passwordsafe, bibtex, gummi, latex, mupdf-x11-curl
7 * new profiles: pdflatex, tex, wpp, wpspdf, wps, et, multimc, mupdf-x11 8 * new profiles: pdflatex, tex, wpp, wpspdf, wps, et, multimc, mupdf-x11
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 969209869..c7269857d 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -151,6 +151,10 @@ static int check_nodbus(void) {
151 return arg_nodbus != 0; 151 return arg_nodbus != 0;
152} 152}
153 153
154static int check_nosound(void) {
155 return arg_nosound != 0;
156}
157
154static int check_x11(void) { 158static int check_x11(void) {
155 return (arg_x11_block || arg_x11_xorg || getenv("FIREJAIL_X11")); 159 return (arg_x11_block || arg_x11_xorg || getenv("FIREJAIL_X11"));
156} 160}
@@ -167,6 +171,7 @@ Cond conditionals[] = {
167 {"HAS_APPIMAGE", check_appimage}, 171 {"HAS_APPIMAGE", check_appimage},
168 {"HAS_NET", check_netoptions}, 172 {"HAS_NET", check_netoptions},
169 {"HAS_NODBUS", check_nodbus}, 173 {"HAS_NODBUS", check_nodbus},
174 {"HAS_NOSOUND", check_nosound},
170 {"HAS_X11", check_x11}, 175 {"HAS_X11", check_x11},
171 {"BROWSER_DISABLE_U2F", check_disable_u2f}, 176 {"BROWSER_DISABLE_U2F", check_disable_u2f},
172 {"BROWSER_ALLOW_DRM", check_allow_drm}, 177 {"BROWSER_ALLOW_DRM", check_allow_drm},
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt
index 84aed41a4..9af25bf63 100644
--- a/src/man/firejail-profile.txt
+++ b/src/man/firejail-profile.txt
@@ -103,7 +103,7 @@ Example: "?HAS_APPIMAGE: whitelist ${HOME}/special/appimage/dir"
103 103
104This example will load the whitelist profile line only if the \-\-appimage option has been specified on the command line. 104This example will load the whitelist profile line only if the \-\-appimage option has been specified on the command line.
105 105
106Currently the only conditionals supported this way are HAS_APPIMAGE, HAS_NET, HAS_NODBUS and HAS_X11. The conditionals BROWSER_DISABLE_U2F and BROWSER_ALLOW_DRM 106Currently the only conditionals supported this way are HAS_APPIMAGE, HAS_NET, HAS_NODBUS, HAS_NOSOUND and HAS_X11. The conditionals BROWSER_DISABLE_U2F and BROWSER_ALLOW_DRM
107can be enabled or disabled globally in Firejail's configuration file. 107can be enabled or disabled globally in Firejail's configuration file.
108 108
109The profile line may be any profile line that you would normally use in a profile \fBexcept\fR for "quiet" and "include" lines. 109The profile line may be any profile line that you would normally use in a profile \fBexcept\fR for "quiet" and "include" lines.