diff options
| author |  Kelvin M. Klann <kmk3.code@protonmail.com> | 2021-10-16 00:17:36 -0300 |
|---|---|---|
| committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2021-10-16 17:08:29 -0300 |
| commit | d1cfa2bfd8e296e14f934010ceb1b466db92e468 (patch) | |
| tree | 9299bbce7e09678da14429096c50676ee841fb01 | |
| parent | util.c: fix return type of get_group_id (diff) | |
| download | firejail-d1cfa2bfd8e296e14f934010ceb1b466db92e468.tar.gz firejail-d1cfa2bfd8e296e14f934010ceb1b466db92e468.tar.zst firejail-d1cfa2bfd8e296e14f934010ceb1b466db92e468.zip | |
util.c: rename "group" arg to "groupname" in get_group_id
To make things clearer, since there is already a `struct group` in the
same function.
| -rw-r--r-- | src/firejail/firejail.h | 2 | ||||
| -rw-r--r-- | src/firejail/util.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h index c8d35c825..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 | gid_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 87ca4c1e7..732e93134 100644 --- a/src/firejail/util.c +++ b/src/firejail/util.c | |||
| @@ -959,9 +959,9 @@ uid_t pid_get_uid(pid_t pid) { | |||
| 959 | } | 959 | } |
| 960 | 960 | ||
| 961 | 961 | ||
| 962 | gid_t get_group_id(const char *group) { | 962 | gid_t get_group_id(const char *groupname) { |
| 963 | gid_t gid = 0; | 963 | gid_t gid = 0; |
| 964 | struct group *g = getgrnam(group); | 964 | struct group *g = getgrnam(groupname); |
| 965 | if (g) | 965 | if (g) |
| 966 | gid = g->gr_gid; | 966 | gid = g->gr_gid; |
| 967 | 967 | ||