michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-09-19 03:50:39 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Skip duplicate users https://github.com/webmin/webmin/issues/673

Browse Source
This commit is contained in:
Jamie Cameron
2017-10-29 18:37:54 -07:00
parent 51cc215603
commit 7a87f779a5
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
group_chooser.cgi
View File

@@ -191,7 +191,9 @@ if ($access{'gedit_mode'} == 2 || $access{'gedit_mode'} == 3) {
map { $gcan{$_}++ } split(/\s+/, $access{'gedit'});
}
setgrent();
local %doneg;
while(@ginfo = getgrent()) {
next if ($doneg{$ginfo[0]}++);
@mems = &unique( split(/ /, $ginfo[3]), @{$members{$ginfo[2]}} );
if (@mems > 3) { @mems = (@mems[0..1], "..."); }
$ginfo[3] = join(' ', @mems);

2
user_chooser.cgi
View File

@@ -182,7 +182,9 @@ if ($access{'uedit_mode'} == 2 || $access{'uedit_mode'} == 3) {
map { $ucan{$_}++ } split(/\s+/, $access{'uedit'});
}
setpwent();
local %doneu;
while(@uinfo = getpwent()) {
next if ($doneu{$uinfo[0]}++);
if ($access{'uedit_mode'} == 5 && $access{'uedit'} !~ /^\d+$/) {
# Get group for matching by group name
@ginfo = getgrgid($uinfo[3]);