aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@protonmail.com>2022-06-19 13:24:29 -0400
committerLibravatar netblue30 <netblue30@protonmail.com>2022-06-19 13:24:29 -0400
commit4d79566ae3cef90700264f962837887a2d26fcf2 (patch)
tree154c0fc83b0cb222f07ec38d6c0ea94418676fc4 /src
parentremoving guess_shell() function and using instead the shell configured in the... (diff)
downloadfirejail-4d79566ae3cef90700264f962837887a2d26fcf2.tar.gz
firejail-4d79566ae3cef90700264f962837887a2d26fcf2.tar.zst
firejail-4d79566ae3cef90700264f962837887a2d26fcf2.zip
shell none set as default
Diffstat (limited to 'src')
-rw-r--r--src/firejail/main.c4
-rw-r--r--src/firejail/profile.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 2a68dc806..640605a6c 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -105,7 +105,7 @@ char *arg_netfilter_file = NULL; // netfilter file
105char *arg_netfilter6_file = NULL; // netfilter6 file 105char *arg_netfilter6_file = NULL; // netfilter6 file
106char *arg_netns = NULL; // "ip netns"-created network namespace to use 106char *arg_netns = NULL; // "ip netns"-created network namespace to use
107int arg_doubledash = 0; // double dash 107int arg_doubledash = 0; // double dash
108int arg_shell_none = 0; // run the program directly without a shell 108int arg_shell_none = 1; // run the program directly without a shell
109int arg_private_dev = 0; // private dev directory 109int arg_private_dev = 0; // private dev directory
110int arg_keep_dev_shm = 0; // preserve /dev/shm 110int arg_keep_dev_shm = 0; // preserve /dev/shm
111int arg_private_etc = 0; // private etc directory 111int arg_private_etc = 0; // private etc directory
@@ -2692,7 +2692,7 @@ int main(int argc, char **argv, char **envp) {
2692 // already handled 2692 // already handled
2693 } 2693 }
2694 else if (strcmp(argv[i], "--shell=none") == 0) { 2694 else if (strcmp(argv[i], "--shell=none") == 0) {
2695 arg_shell_none = 1; 2695 fprintf(stderr, "Warning: --shell=none is done by default; the command will be deprecated\n");
2696 if (cfg.shell) { 2696 if (cfg.shell) {
2697 fprintf(stderr, "Error: a shell was already specified\n"); 2697 fprintf(stderr, "Error: a shell was already specified\n");
2698 return 1; 2698 return 1;
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 3a4d74317..b0389fc3f 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -367,7 +367,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
367 return 0; 367 return 0;
368 } 368 }
369 else if (strcmp(ptr, "shell none") == 0) { 369 else if (strcmp(ptr, "shell none") == 0) {
370 arg_shell_none = 1; 370 fprintf(stderr, "Warning: \"shell none\" command in the profile file is done by default; the command will be deprecated\n");
371 return 0; 371 return 0;
372 } 372 }
373 else if (strcmp(ptr, "tracelog") == 0) { 373 else if (strcmp(ptr, "tracelog") == 0) {