mirror of
https://github.com/netblue30/firejail.git
synced 2026-05-16 14:16:16 -06:00
Fix misc whitespace
Command used to check for whitespace errors:
$ git diff --check 0.9.78..
This commit is contained in:
parent
e68fe24d21
commit
167a0ea74a
17 changed files with 8 additions and 30 deletions
|
|
@ -18,7 +18,7 @@
|
||||||
deny /tmp/.X[0-9]*-lock mrwkl,
|
deny /tmp/.X[0-9]*-lock mrwkl,
|
||||||
deny /tmp/systemd* mrwkl,
|
deny /tmp/systemd* mrwkl,
|
||||||
deny /tmp/ssh* mrwkl,
|
deny /tmp/ssh* mrwkl,
|
||||||
|
|
||||||
deny /etc/ssh/{,**} mrwkl,
|
deny /etc/ssh/{,**} mrwkl,
|
||||||
deny /etc/ssl/{,**} mrwkl,
|
deny /etc/ssl/{,**} mrwkl,
|
||||||
deny /etc/ca-certificates/{,**} mrwkl,
|
deny /etc/ca-certificates/{,**} mrwkl,
|
||||||
|
|
|
||||||
|
|
@ -12,4 +12,3 @@ include <tunables/global>
|
||||||
network packet,
|
network packet,
|
||||||
network raw,
|
network raw,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
3
gcov.sh
3
gcov.sh
|
|
@ -24,7 +24,6 @@ gcov_generate() {
|
||||||
/usr/bin/jailcheck --help
|
/usr/bin/jailcheck --help
|
||||||
sleep 2
|
sleep 2
|
||||||
|
|
||||||
|
|
||||||
# --help -secondary programs
|
# --help -secondary programs
|
||||||
/usr/lib/firejail/etc-cleanup --help
|
/usr/lib/firejail/etc-cleanup --help
|
||||||
/usr/lib/firejail/fbuilder --help
|
/usr/lib/firejail/fbuilder --help
|
||||||
|
|
@ -78,5 +77,3 @@ make test-private-etc
|
||||||
gcov_generate
|
gcov_generate
|
||||||
make test-seccomp-extra
|
make test-seccomp-extra
|
||||||
gcov_generate
|
gcov_generate
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -43,10 +43,3 @@ if test -f src/firejail/main.gcno; then
|
||||||
src/fzenity \
|
src/fzenity \
|
||||||
src/lib
|
src/lib
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -169,7 +169,7 @@ static int disable_file(OPERATION op, const char *filename) {
|
||||||
fwarning("cannot blacklist %s, mount failed\n", fname);
|
fwarning("cannot blacklist %s, mount failed\n", fname);
|
||||||
retval = 1;
|
retval = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// files in /etc will be reprocessed during /etc rebuild
|
// files in /etc will be reprocessed during /etc rebuild
|
||||||
if (strncmp(fname, "/etc/", 5) == 0) {
|
if (strncmp(fname, "/etc/", 5) == 0) {
|
||||||
ProfileEntry *prf = malloc(sizeof(ProfileEntry));
|
ProfileEntry *prf = malloc(sizeof(ProfileEntry));
|
||||||
|
|
@ -831,7 +831,7 @@ void fs_proc_sys_dev_boot(void) {
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
fwarning("cannot hide pid 1 inside the sandbox\n");
|
fwarning("cannot hide pid 1 inside the sandbox\n");
|
||||||
|
|
||||||
// remove kernel symbol information
|
// remove kernel symbol information
|
||||||
if (!arg_allow_debuggers) {
|
if (!arg_allow_debuggers) {
|
||||||
disable_file(BLACKLIST_FILE, "/usr/src/linux");
|
disable_file(BLACKLIST_FILE, "/usr/src/linux");
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
// build a random host name
|
// build a random host name
|
||||||
static char *random_hostname(void) {
|
static char *random_hostname(void) {
|
||||||
assert(!arg_keep_hostname);
|
assert(!arg_keep_hostname);
|
||||||
|
|
||||||
char vowels[] = { 'a', 'e', 'i', 'o', 'u'};
|
char vowels[] = { 'a', 'e', 'i', 'o', 'u'};
|
||||||
char consonants[] = {'b', 'c', 'c', 'c', 'g', 'h', 'h', 'h', 'h', 'h',
|
char consonants[] = {'b', 'c', 'c', 'c', 'g', 'h', 'h', 'h', 'h', 'h',
|
||||||
'j', 'j', 'k', 'k', 'k', 'k', 'k', 'k', 'k', 'k', 'k', 'k', 'm', 'm', 'm', 'm', 'n', 'n', 'n', 'n', 'n',
|
'j', 'j', 'k', 'k', 'k', 'k', 'k', 'k', 'k', 'k', 'k', 'k', 'm', 'm', 'm', 'm', 'n', 'n', 'n', 'n', 'n',
|
||||||
|
|
|
||||||
|
|
@ -983,12 +983,12 @@ int sandbox(void* sandbox_arg) {
|
||||||
if (!arg_keep_hostname) {
|
if (!arg_keep_hostname) {
|
||||||
fs_hostname();
|
fs_hostname();
|
||||||
// /usr/bin/hostname is blacklisted in default.profile
|
// /usr/bin/hostname is blacklisted in default.profile
|
||||||
// test this using cat /proc/sys/kernel/hostname,
|
// test this using cat /proc/sys/kernel/hostname,
|
||||||
assert(cfg.hostname);
|
assert(cfg.hostname);
|
||||||
if (sethostname(cfg.hostname, strlen(cfg.hostname)) < 0)
|
if (sethostname(cfg.hostname, strlen(cfg.hostname)) < 0)
|
||||||
errExit("sethostname");
|
errExit("sethostname");
|
||||||
}
|
}
|
||||||
|
|
||||||
//****************************
|
//****************************
|
||||||
// /etc overrides from the network namespace
|
// /etc overrides from the network namespace
|
||||||
//****************************
|
//****************************
|
||||||
|
|
|
||||||
|
|
@ -629,7 +629,7 @@ static void run_trace(void) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
*ptr = '\0';
|
*ptr = '\0';
|
||||||
|
|
||||||
if (strstr(buf, "/../") ||
|
if (strstr(buf, "/../") ||
|
||||||
strstr(buf, "/./") ||
|
strstr(buf, "/./") ||
|
||||||
strstr(buf, "//") ||
|
strstr(buf, "//") ||
|
||||||
|
|
@ -653,7 +653,7 @@ static void run_trace(void) {
|
||||||
sleep(4);
|
sleep(4);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("Saving stats in %s file...\n", buf);
|
printf("Saving stats in %s file...\n", buf);
|
||||||
print_stats(fp);
|
print_stats(fp);
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
|
|
||||||
|
|
@ -69,4 +69,3 @@ void killprogs(void) {
|
||||||
p = p->next;
|
p = p->next;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -33,5 +33,3 @@ rm -f src/dircopy.exp
|
||||||
|
|
||||||
cd ../..
|
cd ../..
|
||||||
./mkgcov.sh
|
./mkgcov.sh
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -43,4 +43,3 @@ expect {
|
||||||
|
|
||||||
after 100
|
after 100
|
||||||
puts "\nexpect script done\r"
|
puts "\nexpect script done\r"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,4 +24,3 @@ expect {
|
||||||
|
|
||||||
after 100
|
after 100
|
||||||
puts "\nexpect script done\r"
|
puts "\nexpect script done\r"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,4 +20,3 @@ expect {
|
||||||
|
|
||||||
after 100
|
after 100
|
||||||
puts "\nexpect script done\r"
|
puts "\nexpect script done\r"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,4 +20,3 @@ expect {
|
||||||
|
|
||||||
after 100
|
after 100
|
||||||
puts "\nexpect script done\r"
|
puts "\nexpect script done\r"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,4 +20,3 @@ expect {
|
||||||
|
|
||||||
sleep 1
|
sleep 1
|
||||||
puts "\nexpect script done\r"
|
puts "\nexpect script done\r"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,5 @@ expect {
|
||||||
-re "EXIT SANDBOX"
|
-re "EXIT SANDBOX"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
sleep 1
|
sleep 1
|
||||||
puts "\nall done\r"
|
puts "\nall done\r"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,4 +32,3 @@ expect {
|
||||||
sleep 1
|
sleep 1
|
||||||
|
|
||||||
puts "\nall done\r"
|
puts "\nall done\r"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue