mirror of
https://github.com/opnsense/src.git
synced 2026-04-22 23:02:02 -04:00
Fixed merging error. Lite2 fixed premature failure and didn't
touch duplicate group suppression, but the merge blew away our duplicate group suppression. The merge also blew away the -Wall cleanup in rev.1.5, but that was misformatted, so I didn't restore it.
This commit is contained in:
parent
ed1fa5e0fd
commit
c047aec843
1 changed files with 4 additions and 2 deletions
|
|
@ -69,8 +69,10 @@ getgrouplist(uname, agroup, groups, grpcnt)
|
|||
*/
|
||||
setgrent();
|
||||
while (grp = getgrent()) {
|
||||
if (grp->gr_gid == agroup)
|
||||
continue;
|
||||
for (i = 0; i < ngroups; i++) {
|
||||
if (grp->gr_gid == groups[i])
|
||||
goto skip;
|
||||
}
|
||||
for (i = 0; grp->gr_mem[i]; i++) {
|
||||
if (!strcmp(grp->gr_mem[i], uname)) {
|
||||
if (ngroups >= maxgroups) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue