From 01129ad401b7020b6d7b5270e450729c36f4444e Mon Sep 17 00:00:00 2001 From: Antonio Russo Date: Mon, 23 Apr 2018 02:21:02 -0400 Subject: Re-enable join-or-start Use read_pid in place of name2pid, and re-enable the join-or-start code block. Signed-off-by: Antonio Russo --- src/firejail/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src') diff --git a/src/firejail/main.c b/src/firejail/main.c index 017c6c843..1a37aca2f 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c @@ -701,17 +701,15 @@ static void run_cmd_and_exit(int i, int argc, char **argv) { cfg.original_program_index = i + 1; } -#if 0 // todo: redo it // try to join by name only pid_t pid; - if (!name2pid(argv[i] + 16, &pid)) { + if (!read_pid(argv[i] + 16, &pid)) { if (!cfg.shell && !arg_shell_none) cfg.shell = guess_shell(); join(pid, argc, argv, i + 1); exit(0); } -#endif // if there no such sandbox continue argument processing } #ifdef HAVE_NETWORK -- cgit v1.2.3-54-g00ecf