diff options
author | 2020-11-25 17:07:53 +0100 | |
---|---|---|
committer | 2020-11-25 17:07:53 +0100 | |
commit | d840718ef10fa38c18b432f031fcc03aedee9c9a (patch) | |
tree | 09cf146d82d2c5bad96901b05da3136e15fbd975 /src | |
parent | make ${HOME}/.local/lib read-only (diff) | |
download | firejail-d840718ef10fa38c18b432f031fcc03aedee9c9a.tar.gz firejail-d840718ef10fa38c18b432f031fcc03aedee9c9a.tar.zst firejail-d840718ef10fa38c18b432f031fcc03aedee9c9a.zip |
revisit join-or-start hidepid fix
cf. 9eb9e8d4c1b8995f0e7af4d604f3becd5dc91f62
No need to expect pid's in profile files.
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/profile.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/firejail/profile.c b/src/firejail/profile.c index dc37a2820..ff8b47102 100644 --- a/src/firejail/profile.c +++ b/src/firejail/profile.c | |||
@@ -1497,7 +1497,10 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { | |||
1497 | if (checkcfg(CFG_JOIN) || getuid() == 0) { | 1497 | if (checkcfg(CFG_JOIN) || getuid() == 0) { |
1498 | // try to join by name only | 1498 | // try to join by name only |
1499 | pid_t pid; | 1499 | pid_t pid; |
1500 | if (!read_pid(ptr + 14, &pid)) { | 1500 | EUID_ROOT(); |
1501 | int r = name2pid(ptr + 14, &pid); | ||
1502 | EUID_USER(); | ||
1503 | if (!r) { | ||
1501 | if (!cfg.shell && !arg_shell_none) | 1504 | if (!cfg.shell && !arg_shell_none) |
1502 | cfg.shell = guess_shell(); | 1505 | cfg.shell = guess_shell(); |
1503 | 1506 | ||