aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/firejail/main.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/firejail/main.c b/src/firejail/main.c
index fac357303..ed31efb6c 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -894,8 +894,8 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
894 894
895 } 895 }
896 else if (strncmp(argv[i], "--join-or-start=", 16) == 0) { 896 else if (strncmp(argv[i], "--join-or-start=", 16) == 0) {
897 // NOTE: this is first part of option handler, sandbox name is 897 // Note: This is the first part of the option handler; the
898 // set in other part 898 // sandbox name is set in the other part
899 if (checkcfg(CFG_JOIN) || getuid() == 0) { 899 if (checkcfg(CFG_JOIN) || getuid() == 0) {
900 logargs(argc, argv); 900 logargs(argc, argv);
901 901
@@ -2818,8 +2818,9 @@ int main(int argc, char **argv, char **envp) {
2818 } 2818 }
2819#endif 2819#endif
2820 else if (strncmp(argv[i], "--join-or-start=", 16) == 0) { 2820 else if (strncmp(argv[i], "--join-or-start=", 16) == 0) {
2821 // NOTE: this is second part of option handler, atempt 2821 // Note: This is the second part of the option handler;
2822 // to find and join sandbox is done in other one 2822 // the attempt to find and join the sandbox is done in
2823 // the other one
2823 2824
2824 // set sandbox name and start normally 2825 // set sandbox name and start normally
2825 cfg.name = argv[i] + 16; 2826 cfg.name = argv[i] + 16;