diff options
author | 2016-11-30 12:59:48 -0500 | |
---|---|---|
committer | 2016-11-30 12:59:48 -0500 | |
commit | 7c1ed2fb0525cb1f1dcb5e08bf52756b7ac863ed (patch) | |
tree | 2891cf9b5fc96aac148306b672075847a9841198 /src/firejail | |
parent | profiles (diff) | |
download | firejail-7c1ed2fb0525cb1f1dcb5e08bf52756b7ac863ed.tar.gz firejail-7c1ed2fb0525cb1f1dcb5e08bf52756b7ac863ed.tar.zst firejail-7c1ed2fb0525cb1f1dcb5e08bf52756b7ac863ed.zip |
private-opt, private-srv
Diffstat (limited to 'src/firejail')
-rw-r--r-- | src/firejail/join.c | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/src/firejail/join.c b/src/firejail/join.c index 628002d35..bcf951f33 100644 --- a/src/firejail/join.c +++ b/src/firejail/join.c | |||
@@ -285,12 +285,6 @@ void join(pid_t pid, int argc, char **argv, int index) { | |||
285 | seccomp_load(RUN_SECCOMP_CFG); | 285 | seccomp_load(RUN_SECCOMP_CFG); |
286 | #endif | 286 | #endif |
287 | 287 | ||
288 | // fix qt 4.8 | ||
289 | if (setenv("QT_X11_NO_MITSHM", "1", 1) < 0) | ||
290 | errExit("setenv"); | ||
291 | if (setenv("container", "firejail", 1) < 0) // LXC sets container=lxc, | ||
292 | errExit("setenv"); | ||
293 | |||
294 | // mount user namespace or drop privileges | 288 | // mount user namespace or drop privileges |
295 | if (arg_noroot) { // not available for uid 0 | 289 | if (arg_noroot) { // not available for uid 0 |
296 | if (arg_debug) | 290 | if (arg_debug) |
@@ -307,14 +301,6 @@ void join(pid_t pid, int argc, char **argv, int index) { | |||
307 | drop_privs(arg_nogroups); // nogroups not available for uid 0 | 301 | drop_privs(arg_nogroups); // nogroups not available for uid 0 |
308 | 302 | ||
309 | 303 | ||
310 | // set prompt color to green | ||
311 | char *prompt = getenv("FIREJAIL_PROMPT"); | ||
312 | if (prompt && strcmp(prompt, "yes") == 0) { | ||
313 | //export PS1='\[\e[1;32m\][\u@\h \W]\$\[\e[0m\] ' | ||
314 | if (setenv("PROMPT_COMMAND", "export PS1=\"\\[\\e[1;32m\\][\\u@\\h \\W]\\$\\[\\e[0m\\] \"", 1) < 0) | ||
315 | errExit("setenv"); | ||
316 | } | ||
317 | |||
318 | // set nice | 304 | // set nice |
319 | if (arg_nice) { | 305 | if (arg_nice) { |
320 | errno = 0; | 306 | errno = 0; |
@@ -326,24 +312,9 @@ void join(pid_t pid, int argc, char **argv, int index) { | |||
326 | } | 312 | } |
327 | } | 313 | } |
328 | 314 | ||
329 | // run cmdline trough shell | 315 | env_defaults(); |
330 | if (cfg.command_line == NULL) { | 316 | if (cfg.command_line == NULL) { |
331 | // if the sandbox was started with --shell=none, it is possible we don't have a shell | 317 | assert(cfg.shell); |
332 | // inside the sandbox | ||
333 | if (cfg.shell == NULL) { | ||
334 | cfg.shell = guess_shell(); | ||
335 | if (!cfg.shell) { | ||
336 | fprintf(stderr, "Error: no POSIX shell found, please use --shell command line option\n"); | ||
337 | exit(1); | ||
338 | } | ||
339 | } | ||
340 | |||
341 | struct stat s; | ||
342 | if (stat(cfg.shell, &s) == -1) { | ||
343 | fprintf(stderr, "Error: %s shell not found inside the sandbox\n", cfg.shell); | ||
344 | exit(1); | ||
345 | } | ||
346 | |||
347 | cfg.command_line = cfg.shell; | 318 | cfg.command_line = cfg.shell; |
348 | cfg.window_title = cfg.shell; | 319 | cfg.window_title = cfg.shell; |
349 | } | 320 | } |