diff options
| author |  netblue30 <netblue30@yahoo.com> | 2016-06-12 11:58:59 -0400 |
|---|---|---|
| committer | netblue30 <netblue30@yahoo.com> | 2016-06-12 11:58:59 -0400 |
| commit | a137cfb715fab07a2e21cf2a0770d1afcd2e2119 (patch) | |
| tree | eca38e162a3b898aa4603164e2f3e227a3058b8a /src | |
| parent | support to disable enforcing firejail.config (diff) | |
| download | firejail-a137cfb715fab07a2e21cf2a0770d1afcd2e2119.tar.gz firejail-a137cfb715fab07a2e21cf2a0770d1afcd2e2119.tar.zst firejail-a137cfb715fab07a2e21cf2a0770d1afcd2e2119.zip | |
fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/firejail/fs.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/firejail/fs.c b/src/firejail/fs.c index acc03e412..7811fd2a2 100644 --- a/src/firejail/fs.c +++ b/src/firejail/fs.c | |||
| @@ -725,8 +725,6 @@ void fs_basic_fs(void) { | |||
| 725 | // firejail sandboxes (firejail --force) | 725 | // firejail sandboxes (firejail --force) |
| 726 | if (getuid() != 0) | 726 | if (getuid() != 0) |
| 727 | disable_firejail_config(); | 727 | disable_firejail_config(); |
| 728 | else | ||
| 729 | fprintf(stderr, "Warning: masking /etc/firejail disabled when starting the sandbox as root\n"); | ||
| 730 | 728 | ||
| 731 | if (getuid() == 0) | 729 | if (getuid() == 0) |
| 732 | fs_rdwr(); | 730 | fs_rdwr(); |
| @@ -964,8 +962,6 @@ void fs_overlayfs(void) { | |||
| 964 | // firejail sandboxes (firejail --force) | 962 | // firejail sandboxes (firejail --force) |
| 965 | if (getuid() != 0) | 963 | if (getuid() != 0) |
| 966 | disable_firejail_config(); | 964 | disable_firejail_config(); |
| 967 | else | ||
| 968 | fprintf(stderr, "Warning: masking /etc/firejail disabled when starting the sandbox as root\n"); | ||
| 969 | 965 | ||
| 970 | // cleanup and exit | 966 | // cleanup and exit |
| 971 | free(option); | 967 | free(option); |
| @@ -1101,8 +1097,6 @@ void fs_chroot(const char *rootdir) { | |||
| 1101 | // firejail sandboxes (firejail --force) | 1097 | // firejail sandboxes (firejail --force) |
| 1102 | if (getuid() != 0) | 1098 | if (getuid() != 0) |
| 1103 | disable_firejail_config(); | 1099 | disable_firejail_config(); |
| 1104 | else | ||
| 1105 | fprintf(stderr, "Warning: masking /etc/firejail disabled when starting the sandbox as root\n"); | ||
| 1106 | } | 1100 | } |
| 1107 | #endif | 1101 | #endif |
| 1108 | 1102 | ||