From 4d79566ae3cef90700264f962837887a2d26fcf2 Mon Sep 17 00:00:00 2001 From: netblue30 Date: Sun, 19 Jun 2022 13:24:29 -0400 Subject: shell none set as default --- src/firejail/main.c | 4 ++-- src/firejail/profile.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') 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 char *arg_netfilter6_file = NULL; // netfilter6 file char *arg_netns = NULL; // "ip netns"-created network namespace to use int arg_doubledash = 0; // double dash -int arg_shell_none = 0; // run the program directly without a shell +int arg_shell_none = 1; // run the program directly without a shell int arg_private_dev = 0; // private dev directory int arg_keep_dev_shm = 0; // preserve /dev/shm int arg_private_etc = 0; // private etc directory @@ -2692,7 +2692,7 @@ int main(int argc, char **argv, char **envp) { // already handled } else if (strcmp(argv[i], "--shell=none") == 0) { - arg_shell_none = 1; + fprintf(stderr, "Warning: --shell=none is done by default; the command will be deprecated\n"); if (cfg.shell) { fprintf(stderr, "Error: a shell was already specified\n"); 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) { return 0; } else if (strcmp(ptr, "shell none") == 0) { - arg_shell_none = 1; + fprintf(stderr, "Warning: \"shell none\" command in the profile file is done by default; the command will be deprecated\n"); return 0; } else if (strcmp(ptr, "tracelog") == 0) { -- cgit v1.2.3-54-g00ecf