diff options
author | SYN-cook <syncookongit@gmail.com> | 2017-05-11 01:53:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-11 01:53:04 +0200 |
commit | fdf87add9ac0df0e8de6b95a1f42a73b2098adec (patch) | |
tree | c35dfd4ba3e172236bf5172f7dafdf41fa8bbf20 /src | |
parent | add noexec folders (tmp/.X11-unix and .config/pulse) (diff) | |
download | firejail-fdf87add9ac0df0e8de6b95a1f42a73b2098adec.tar.gz firejail-fdf87add9ac0df0e8de6b95a1f42a73b2098adec.tar.zst firejail-fdf87add9ac0df0e8de6b95a1f42a73b2098adec.zip |
fix noexec on .config/pulse
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/sandbox.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c index ecc365895..d8880b924 100644 --- a/src/firejail/sandbox.c +++ b/src/firejail/sandbox.c | |||
@@ -789,7 +789,23 @@ int sandbox(void* sandbox_arg) { | |||
789 | //**************************** | 789 | //**************************** |
790 | if (checkcfg(CFG_DISABLE_MNT)) | 790 | if (checkcfg(CFG_DISABLE_MNT)) |
791 | fs_mnt(); | 791 | fs_mnt(); |
792 | |||
793 | //**************************** | ||
794 | // nosound/no3d and fix for pulseaudio 7.0 | ||
795 | //**************************** | ||
796 | if (arg_nosound) { | ||
797 | // disable pulseaudio | ||
798 | pulseaudio_disable(); | ||
792 | 799 | ||
800 | // disable /dev/snd | ||
801 | fs_dev_disable_sound(); | ||
802 | } | ||
803 | else | ||
804 | pulseaudio_init(); | ||
805 | |||
806 | if (arg_no3d) | ||
807 | fs_dev_disable_3d(); | ||
808 | |||
793 | //**************************** | 809 | //**************************** |
794 | // apply the profile file | 810 | // apply the profile file |
795 | //**************************** | 811 | //**************************** |
@@ -809,22 +825,6 @@ int sandbox(void* sandbox_arg) { | |||
809 | //**************************** | 825 | //**************************** |
810 | if (arg_trace || arg_tracelog) | 826 | if (arg_trace || arg_tracelog) |
811 | fs_trace(); | 827 | fs_trace(); |
812 | |||
813 | //**************************** | ||
814 | // nosound/no3d and fix for pulseaudio 7.0 | ||
815 | //**************************** | ||
816 | if (arg_nosound) { | ||
817 | // disable pulseaudio | ||
818 | pulseaudio_disable(); | ||
819 | |||
820 | // disable /dev/snd | ||
821 | fs_dev_disable_sound(); | ||
822 | } | ||
823 | else | ||
824 | pulseaudio_init(); | ||
825 | |||
826 | if (arg_no3d) | ||
827 | fs_dev_disable_3d(); | ||
828 | 828 | ||
829 | //**************************** | 829 | //**************************** |
830 | // set dns | 830 | // set dns |