aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-06-14 15:33:57 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2016-06-14 15:33:57 -0400
commit980e11d8e1e31d51bf04f2e6f31de1511b709351 (patch)
treeac98a1b26db43a3670593a39cc02a4f96866a18e
parenttesting (diff)
downloadfirejail-980e11d8e1e31d51bf04f2e6f31de1511b709351.tar.gz
firejail-980e11d8e1e31d51bf04f2e6f31de1511b709351.tar.zst
firejail-980e11d8e1e31d51bf04f2e6f31de1511b709351.zip
pulseaudio fix
-rw-r--r--src/firejail/pulseaudio.c4
-rwxr-xr-xtest/test.sh5
2 files changed, 0 insertions, 9 deletions
diff --git a/src/firejail/pulseaudio.c b/src/firejail/pulseaudio.c
index 1eb5e59e1..767aaab09 100644
--- a/src/firejail/pulseaudio.c
+++ b/src/firejail/pulseaudio.c
@@ -104,10 +104,6 @@ void pulseaudio_init(void) {
104 char *pulsecfg = NULL; 104 char *pulsecfg = NULL;
105 if (asprintf(&pulsecfg, "%s/client.conf", RUN_PULSE_DIR) == -1) 105 if (asprintf(&pulsecfg, "%s/client.conf", RUN_PULSE_DIR) == -1)
106 errExit("asprintf"); 106 errExit("asprintf");
107 if (is_link("/etc/pulse/client.conf")) {
108 fprintf(stderr, "Error: invalid /etc/pulse/client.conf file\n");
109 exit(1);
110 }
111 if (copy_file("/etc/pulse/client.conf", pulsecfg)) 107 if (copy_file("/etc/pulse/client.conf", pulsecfg))
112 errExit("copy_file"); 108 errExit("copy_file");
113 FILE *fp = fopen(pulsecfg, "a+"); 109 FILE *fp = fopen(pulsecfg, "a+");
diff --git a/test/test.sh b/test/test.sh
index 4d57aaad2..71e2c6720 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -27,9 +27,6 @@ rm -fr auto2
27rm -fr auto3 27rm -fr auto3
28rm -fr auto4 28rm -fr auto4
29 29
30echo "TESTING: extract command (extract_command.exp)"
31./extract_command.exp
32
33echo "TESTING: chroot overlay (option_chroot_overlay.exp)" 30echo "TESTING: chroot overlay (option_chroot_overlay.exp)"
34./option_chroot_overlay.exp 31./option_chroot_overlay.exp
35 32
@@ -46,8 +43,6 @@ sleep 5
46rm -f tmpreadonly 43rm -f tmpreadonly
47 44
48 45
49echo "TESTING: output (output.exp)"
50./output.exp
51 46
52echo "TESTING: private directory (private_dir.exp)" 47echo "TESTING: private directory (private_dir.exp)"
53rm -fr dirprivate 48rm -fr dirprivate