picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sysusers: do not create duplicated groups when create users

Browse source 
The commit e2c2060f7b introduces
the issue #8315.

Fixes #8315.
This commit is contained in:
Yu Watanabe 2018-03-02 03:27:34 +09:00
parent 671f0f8de0
commit b5327d0a65
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/sysusers/sysusers.c
View file

@ -1209,12 +1209,25 @@ static int process_item(Item *i) {
switch (i->type) {
case ADD_USER:
r = add_group(i);
if (r < 0)
return r;
case ADD_USER: {
Item *j;
j = ordered_hashmap_get(groups, i->name);
if (j && j->todo_group) {
/* When the group with the same name is already in queue,
* use the information about the group and do not create
* duplicated group entry. */
i->gid_set = j->gid_set;
i->gid = j->gid;
i->id_set_strict = true;
} else {
r = add_group(i);
if (r < 0)
return r;
}
return add_user(i);
}
case ADD_GROUP:
return add_group(i);