1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-08 20:58:20 +03:00

sysusers: properly process user entries with an explicit GID

This tweaks user creation logic to properly take into consideration
an explicitly requested GID.
It fixes a bug where the creation flow would mistakenly fall back
to use the username instead, resulting in wrong lookups in case of
users and groups using the same name.

(cherry picked from commit 5ed47c4d230b9491339c16c6ea4181dfd293bc98)
This commit is contained in:
Luca BRUNO 2022-08-08 15:56:06 +00:00 committed by Zbigniew Jędrzejewski-Szmek
parent ec5a46ca34
commit f9d936b865

View File

@ -1348,9 +1348,11 @@ static int process_item(Item *i) {
switch (i->type) {
case ADD_USER: {
Item *j;
Item *j = NULL;
if (!i->gid_set)
j = ordered_hashmap_get(groups, i->group_name ?: i->name);
j = ordered_hashmap_get(groups, i->group_name ?: i->name);
if (j && j->todo_group) {
/* When a group with the target name is already in queue,
* use the information about the group and do not create