aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2017-05-26 21:03:16 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2017-05-26 21:03:16 -0400
commit681cfb19a4c2c830baffd45e8f9b8f7046a0eef1 (patch)
tree39320fa2b9feabd4553462653f88c488560af14e /src
parentwhitelisting ktorrent profile (diff)
downloadfirejail-681cfb19a4c2c830baffd45e8f9b8f7046a0eef1.tar.gz
firejail-681cfb19a4c2c830baffd45e8f9b8f7046a0eef1.tar.zst
firejail-681cfb19a4c2c830baffd45e8f9b8f7046a0eef1.zip
reverted sandbox.c fix from #1270, breaking pulseaudio
Diffstat (limited to 'src')
-rw-r--r--src/firejail/sandbox.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 0b4d63c1b..7f82e2253 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -791,6 +791,20 @@ int sandbox(void* sandbox_arg) {
791 fs_mnt(); 791 fs_mnt();
792 792
793 //**************************** 793 //****************************
794 // apply the profile file
795 //****************************
796 // apply all whitelist commands ...
797 if (cfg.chrootdir)
798 fwarning("whitelist feature is disabled in chroot\n");
799 else if (arg_overlay)
800 fwarning("whitelist feature is disabled in overlay\n");
801 else
802 fs_whitelist();
803
804 // ... followed by blacklist commands
805 fs_blacklist(); // mkdir and mkfile are processed all over again
806
807 //****************************
794 // nosound/no3d and fix for pulseaudio 7.0 808 // nosound/no3d and fix for pulseaudio 7.0
795 //**************************** 809 //****************************
796 if (arg_nosound) { 810 if (arg_nosound) {
@@ -815,20 +829,6 @@ int sandbox(void* sandbox_arg) {
815 } 829 }
816 830
817 //**************************** 831 //****************************
818 // apply the profile file
819 //****************************
820 // apply all whitelist commands ...
821 if (cfg.chrootdir)
822 fwarning("whitelist feature is disabled in chroot\n");
823 else if (arg_overlay)
824 fwarning("whitelist feature is disabled in overlay\n");
825 else
826 fs_whitelist();
827
828 // ... followed by blacklist commands
829 fs_blacklist(); // mkdir and mkfile are processed all over again
830
831 //****************************
832 // install trace 832 // install trace
833 //**************************** 833 //****************************
834 if (arg_trace || arg_tracelog) 834 if (arg_trace || arg_tracelog)