aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xcontrib/syscalls.sh2
-rw-r--r--etc/barrier.profile2
-rw-r--r--src/firejail/fs_etc.c2
-rw-r--r--src/firejail/macros.c2
-rw-r--r--src/firejail/sbox.c2
-rw-r--r--src/firejail/x11.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/contrib/syscalls.sh b/contrib/syscalls.sh
index c9cbad4a6..c9b5a245a 100755
--- a/contrib/syscalls.sh
+++ b/contrib/syscalls.sh
@@ -10,7 +10,7 @@ if [ $# -eq 0 ]
10then 10then
11echo 11echo
12echo " *** No program specified!!! ***" 12echo " *** No program specified!!! ***"
13echo 13echo
14echo -e "Make this file executable and execute it as:\\n" 14echo -e "Make this file executable and execute it as:\\n"
15echo -e "\\e[96m syscalls.sh /full/path/to/program\\n" 15echo -e "\\e[96m syscalls.sh /full/path/to/program\\n"
16echo -e "\\e[39mif you saved this script in a directory in your PATH (e.g., in ${HOME}/bin), otherwise as:\\n" 16echo -e "\\e[39mif you saved this script in a directory in your PATH (e.g., in ${HOME}/bin), otherwise as:\\n"
diff --git a/etc/barrier.profile b/etc/barrier.profile
index a35bb1e09..f5da3782e 100644
--- a/etc/barrier.profile
+++ b/etc/barrier.profile
@@ -4,7 +4,7 @@
4# Persistent local customizations 4# Persistent local customizations
5include barrier.local 5include barrier.local
6# Persistent global definitions 6# Persistent global definitions
7include globals.local 7include globals.local
8 8
9noblacklist ${HOME}/.config/Debauchee/Barrier.conf 9noblacklist ${HOME}/.config/Debauchee/Barrier.conf
10noblacklist ${HOME}/.local/share/barrier 10noblacklist ${HOME}/.local/share/barrier
diff --git a/src/firejail/fs_etc.c b/src/firejail/fs_etc.c
index 26e010d0d..7b7813926 100644
--- a/src/firejail/fs_etc.c
+++ b/src/firejail/fs_etc.c
@@ -141,7 +141,7 @@ void fs_private_dir_list(const char *private_dir, const char *private_run_dir, c
141 assert(private_dir); 141 assert(private_dir);
142 assert(private_run_dir); 142 assert(private_run_dir);
143 assert(private_list); 143 assert(private_list);
144 144
145 // nothing to do if directory does not exist 145 // nothing to do if directory does not exist
146 struct stat s; 146 struct stat s;
147 if (stat(private_dir, &s) == -1) { 147 if (stat(private_dir, &s) == -1) {
diff --git a/src/firejail/macros.c b/src/firejail/macros.c
index 6901b7d44..724411e13 100644
--- a/src/firejail/macros.c
+++ b/src/firejail/macros.c
@@ -306,7 +306,7 @@ void invalid_filename(const char *fname, int globbing) {
306 } 306 }
307 i++; 307 i++;
308 } 308 }
309 309
310 char *reject; 310 char *reject;
311 if (globbing) 311 if (globbing)
312 reject = "\\&!\"'<>%^{};,"; // file globbing ('*?[]') is allowed 312 reject = "\\&!\"'<>%^{};,"; // file globbing ('*?[]') is allowed
diff --git a/src/firejail/sbox.c b/src/firejail/sbox.c
index 203c0fc03..77ca07a81 100644
--- a/src/firejail/sbox.c
+++ b/src/firejail/sbox.c
@@ -116,7 +116,7 @@ int sbox_run(unsigned filtermask, int num, ...) {
116 arg[i] = NULL; 116 arg[i] = NULL;
117 va_end(valist); 117 va_end(valist);
118 118
119 int status = sbox_run_v(filtermask, arg); 119 int status = sbox_run_v(filtermask, arg);
120 120
121 free(arg); 121 free(arg);
122 122
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index 9a50532c2..6395903f9 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -1238,7 +1238,7 @@ void x11_xorg(void) {
1238 errLogExit("invalid .Xauthority mount"); 1238 errLogExit("invalid .Xauthority mount");
1239 1239
1240 ASSERT_PERMS(dest, getuid(), getgid(), 0600); 1240 ASSERT_PERMS(dest, getuid(), getgid(), 0600);
1241 1241
1242 // blacklist .Xauthority file if it is not masked already 1242 // blacklist .Xauthority file if it is not masked already
1243 char *envar = getenv("XAUTHORITY"); 1243 char *envar = getenv("XAUTHORITY");
1244 if (envar) { 1244 if (envar) {