diff options
author | smitsohu <smitsohu@gmail.com> | 2021-10-22 23:41:14 +0200 |
---|---|---|
committer | smitsohu <smitsohu@gmail.com> | 2021-10-22 23:41:14 +0200 |
commit | 98df98e9987357f893cdd1b0f5c9aa8d93ae8d23 (patch) | |
tree | d6c2b69070bcd0ab2649f995998fe5feb8fcc6cc | |
parent | private-bin: switch effective uid (diff) | |
download | firejail-98df98e9987357f893cdd1b0f5c9aa8d93ae8d23.tar.gz firejail-98df98e9987357f893cdd1b0f5c9aa8d93ae8d23.tar.zst firejail-98df98e9987357f893cdd1b0f5c9aa8d93ae8d23.zip |
cleanup
-rw-r--r-- | src/firejail/fs_bin.c | 4 | ||||
-rw-r--r-- | src/firejail/fs_lib.c | 1 | ||||
-rw-r--r-- | src/firejail/util.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/firejail/fs_bin.c b/src/firejail/fs_bin.c index 1ff074599..a4c1ff822 100644 --- a/src/firejail/fs_bin.c +++ b/src/firejail/fs_bin.c | |||
@@ -62,8 +62,8 @@ static char *check_dir_or_file(const char *name) { | |||
62 | if (stat(fname, &s) == 0 && | 62 | if (stat(fname, &s) == 0 && |
63 | !S_ISDIR(s.st_mode) && // do not allow directories | 63 | !S_ISDIR(s.st_mode) && // do not allow directories |
64 | !is_firejail_link(fname)) { // skip symlinks to firejail executable, as created by firecfg | 64 | !is_firejail_link(fname)) { // skip symlinks to firejail executable, as created by firecfg |
65 | free(fname); | 65 | free(fname); |
66 | break; // file found | 66 | break; // file found |
67 | } | 67 | } |
68 | 68 | ||
69 | free(fname); | 69 | free(fname); |
diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c index 249b41a12..03af7f8fb 100644 --- a/src/firejail/fs_lib.c +++ b/src/firejail/fs_lib.c | |||
@@ -68,7 +68,6 @@ int is_firejail_link(const char *fname) { | |||
68 | if (!is_link(fname)) | 68 | if (!is_link(fname)) |
69 | return 0; | 69 | return 0; |
70 | 70 | ||
71 | // char *rp = realpath_as_user(fname, NULL); | ||
72 | char *rp = realpath(fname, NULL); | 71 | char *rp = realpath(fname, NULL); |
73 | if (!rp) | 72 | if (!rp) |
74 | return 0; | 73 | return 0; |
diff --git a/src/firejail/util.c b/src/firejail/util.c index 55dcdc246..86977cecf 100644 --- a/src/firejail/util.c +++ b/src/firejail/util.c | |||
@@ -1031,7 +1031,7 @@ int create_empty_dir_as_user(const char *dir, mode_t mode) { | |||
1031 | waitpid(child, NULL, 0); | 1031 | waitpid(child, NULL, 0); |
1032 | 1032 | ||
1033 | if (access(dir, F_OK) == 0) | 1033 | if (access(dir, F_OK) == 0) |
1034 | return 1; | 1034 | return 1; |
1035 | return 0; | 1035 | return 0; |
1036 | } | 1036 | } |
1037 | 1037 | ||