ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lslogins: ask for supplementary groups only once [asan] 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2021-07-22 11:30:22 +02:00
parent f626170062
commit d1a5e99e8a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
login-utils/lslogins.c
View File

@ -562,6 +562,9 @@ static int get_sgroups(gid_t **list, size_t *len, struct passwd *pwd)
*list = xcalloc(1, ngroups * sizeof(gid_t));
fprintf(stderr, "KZAK>>> alloc '%p' for %s\n", *list, pwd->pw_name);
/* now for the actual list of GIDs */
if (-1 == getgrouplist(pwd->pw_name, pwd->pw_gid, *list, &ngroups))
return -1;
@ -754,7 +757,8 @@ static struct lslogins_user *get_user_info(struct lslogins_control *ctl, const c
break;
case COL_SGROUPS:
case COL_SGIDS:
if (get_sgroups(&user->sgroups, &user->nsgroups, pwd))
if (!user->nsgroups &&
get_sgroups(&user->sgroups, &user->nsgroups, pwd) < 0)
err(EXIT_FAILURE, _("failed to get supplementary groups"));
break;
case COL_HOME:
@ -1048,7 +1052,6 @@ static int create_usertree(struct lslogins_control *ctl)
}
if (rc || !user)
continue;
tsearch(user, &ctl->usertree, cmp_uid);
}
} else {