diff options
author | smitsohu <smitsohu@gmail.com> | 2021-10-17 12:06:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-17 12:06:16 +0200 |
commit | 57b9ff0717e96ce46041da008b2e1a2b5a472591 (patch) | |
tree | b5a5b821a8c8f2ec25a2cb4750524c6aa796db16 /src | |
parent | Merge pull request #4606 from kmk3/rm-limits-h-libtrace (diff) | |
parent | util.c: rename "group" arg to "groupname" in get_group_id (diff) | |
download | firejail-57b9ff0717e96ce46041da008b2e1a2b5a472591.tar.gz firejail-57b9ff0717e96ce46041da008b2e1a2b5a472591.tar.zst firejail-57b9ff0717e96ce46041da008b2e1a2b5a472591.zip |
Merge pull request #4610 from kmk3/fix-misc-get-group-id
Fix misc in get_group_id
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/firejail.h | 2 | ||||
-rw-r--r-- | src/firejail/util.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h index d29c2a976..5bebec185 100644 --- a/src/firejail/firejail.h +++ b/src/firejail/firejail.h | |||
@@ -532,7 +532,7 @@ void update_map(char *mapping, char *map_file); | |||
532 | void wait_for_other(int fd); | 532 | void wait_for_other(int fd); |
533 | void notify_other(int fd); | 533 | void notify_other(int fd); |
534 | uid_t pid_get_uid(pid_t pid); | 534 | uid_t pid_get_uid(pid_t pid); |
535 | uid_t get_group_id(const char *group); | 535 | gid_t get_group_id(const char *groupname); |
536 | void flush_stdin(void); | 536 | void flush_stdin(void); |
537 | int create_empty_dir_as_user(const char *dir, mode_t mode); | 537 | int create_empty_dir_as_user(const char *dir, mode_t mode); |
538 | void create_empty_dir_as_root(const char *dir, mode_t mode); | 538 | void create_empty_dir_as_root(const char *dir, mode_t mode); |
diff --git a/src/firejail/util.c b/src/firejail/util.c index 8749f79cc..732e93134 100644 --- a/src/firejail/util.c +++ b/src/firejail/util.c | |||
@@ -959,10 +959,9 @@ uid_t pid_get_uid(pid_t pid) { | |||
959 | } | 959 | } |
960 | 960 | ||
961 | 961 | ||
962 | uid_t get_group_id(const char *group) { | 962 | gid_t get_group_id(const char *groupname) { |
963 | // find tty group id | ||
964 | gid_t gid = 0; | 963 | gid_t gid = 0; |
965 | struct group *g = getgrnam(group); | 964 | struct group *g = getgrnam(groupname); |
966 | if (g) | 965 | if (g) |
967 | gid = g->gr_gid; | 966 | gid = g->gr_gid; |
968 | 967 | ||