summaryrefslogtreecommitdiffstats
path: root/src/firejail/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/firejail/main.c')
-rw-r--r--src/firejail/main.c30
1 files changed, 27 insertions, 3 deletions
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 476f9c39c..02a55ac70 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -343,7 +343,6 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
343 343
344 // extract pid or sandbox name 344 // extract pid or sandbox name
345 pid_t pid; 345 pid_t pid;
346 EUID_ROOT();
347 if (read_pid(argv[i] + 12, &pid) == 0) 346 if (read_pid(argv[i] + 12, &pid) == 0)
348 bandwidth_pid(pid, cmd, dev, down, up); 347 bandwidth_pid(pid, cmd, dev, down, up);
349 else 348 else
@@ -669,10 +668,35 @@ int main(int argc, char **argv) {
669 int found = 0; 668 int found = 0;
670 for (i = 1; i < argc; i++) { 669 for (i = 1; i < argc; i++) {
671 if (strcmp(argv[i], "--force") == 0 || 670 if (strcmp(argv[i], "--force") == 0 ||
672 strcmp(argv[i], "--netstats") == 0 ||
673 strcmp(argv[i], "--list") == 0 || 671 strcmp(argv[i], "--list") == 0 ||
672 strcmp(argv[i], "--netstats") == 0 ||
674 strcmp(argv[i], "--tree") == 0 || 673 strcmp(argv[i], "--tree") == 0 ||
675 strcmp(argv[i], "--top") == 0) { 674 strcmp(argv[i], "--top") == 0 ||
675 strncmp(argv[i], "--ls=", 5) == 0 ||
676 strncmp(argv[i], "--get=", 6) == 0 ||
677 strcmp(argv[i], "--debug-caps") == 0 ||
678 strcmp(argv[i], "--debug-errnos") == 0 ||
679 strcmp(argv[i], "--debug-syscalls") == 0 ||
680 strcmp(argv[i], "--debug-protocols") == 0 ||
681 strcmp(argv[i], "--help") == 0 ||
682 strcmp(argv[i], "--version") == 0 ||
683 strncmp(argv[i], "--dns.print=", 12) == 0 ||
684 strncmp(argv[i], "--bandwidth=", 12) == 0 ||
685 strncmp(argv[i], "--caps.print=", 13) == 0 ||
686//********************************************************************************
687// todo: fix the following problems
688 strncmp(argv[i], "--join=", 7) == 0 ||
689//[netblue@debian Downloads]$ firejail --join=896
690//Switching to pid 897, the first child process inside the sandbox
691//Error: seccomp file not found
692//********************************************************************************
693
694 strncmp(argv[i], "--join-filesystem=", 18) == 0 ||
695 strncmp(argv[i], "--join-network=", 15) == 0 ||
696 strncmp(argv[i], "--fs.print=", 11) == 0 ||
697 strncmp(argv[i], "--protocol.print=", 17) == 0 ||
698 strncmp(argv[i], "--seccomp.print", 15) == 0 ||
699 strncmp(argv[i], "--shutdown=", 11) == 0) {
676 found = 1; 700 found = 1;
677 break; 701 break;
678 } 702 }